This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] [xen-unstable] tools: xend: tolerate empty state/*.xml

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: xend: tolerate empty state/*.xml
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Mon, 14 Nov 2011 22:55:10 +0000
Delivery-date: Mon, 14 Nov 2011 14:55:34 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
# Date 1321293294 0
# Node ID a3a2e300951a7d181ae825b5de408faa889928c6
# Parent  39bc21b5060b843dc3b1f081c337662efcf0d35a
tools: xend: tolerate empty state/*.xml

Bugzilla 1680: Xend fails to start if /var/lib/xend/state/*.xml are empty
which I get often when replacing the Xen hypervisor with a newer version.

This can be easily be reproduced under Fedora Core 16 by installing
xen RPMs and then replacing the xen.gz with a newer version.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Signed-off-by: Anthony Low <shinji@xxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

diff -r 39bc21b5060b -r a3a2e300951a tools/python/xen/xend/XendStateStore.py
--- a/tools/python/xen/xend/XendStateStore.py   Mon Nov 14 17:50:53 2011 +0000
+++ b/tools/python/xen/xend/XendStateStore.py   Mon Nov 14 17:54:54 2011 +0000
@@ -101,6 +101,9 @@
         if not os.path.exists(xml_path):
             return {}
+        if not os.path.getsize(xml_path) == 0:
+            return {}
         dom = minidom.parse(xml_path)
         root = dom.documentElement
         state = {}

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: xend: tolerate empty state/*.xml, Xen patchbot-unstable <=