<div>My bad, it actually seems that your patch fixed my issue after I manually removed</div><div>the domain XML file that was stuck in /var/run. Nevertheless, it seems that the</div><div>issue when virt-manager exited preamturely could be caused by something else:</div>
<div><br></div><div><blockquote class="gmail_quote" style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
2012-02-05 15:39:28.395+0000: 29540: error : virNetSocketReadWire:999 : End of file while reading data: Input/output error</blockquote></div><div><br></div><div><br></div><div><br><div class="gmail_quote">On Sat, Feb 4, 2012 at 10:18 PM, Ansis Atteka <span dir="ltr"><<a href="mailto:aatteka@nicira.com">aatteka@nicira.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hmm, this patch does not seem to fix my issue. See the both xml files in the attachment.<div class="HOEnZb"><div class="h5">
<div><br></div><div><br><div class="gmail_quote">On Sat, Feb 4, 2012 at 4:10 PM, Eric Blake <span dir="ltr"><<a href="mailto:eblake@redhat.com" target="_blank">eblake@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Commit b170eb99 introduced a bug: domains that had an explicit<br>
<seclabel type='none'/> when started would not be reparsed if<br>
libvirtd restarted. It turns out that our testsuite was not<br>
exercising this because it never tried anything but inactive<br>
parsing. Additionally, the live XML for such a domain failed<br>
to re-validate. Applying just the tests/ portion of this patch<br>
will expose the bugs that are fixed by the other two files.<br>
<br>
* docs/schemas/domaincommon.rng (seclabel): Allow relabel under<br>
type='none'.<br>
* src/conf/domain_conf.c (virSecurityLabelDefParseXML): Per RNG,<br>
presence of <seclabel> with no type implies dynamic. Don't<br>
require sub-elements for type='none'.<br>
* tests/qemuxml2xmltest.c (mymain): Add test.<br>
* tests/qemuxml2argvtest.c (mymain): Likewise.<br>
* tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml: Add file.<br>
* tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args: Add file.<br>
Reported by Ansis Atteka.<br>
---<br>
docs/schemas/domaincommon.rng | 6 +++<br>
src/conf/domain_conf.c | 40 +++++++++-----------<br>
.../qemuxml2argv-seclabel-none.args | 4 ++<br>
.../qemuxml2argv-seclabel-none.xml | 26 +++++++++++++<br>
tests/qemuxml2argvtest.c | 1 +<br>
tests/qemuxml2xmltest.c | 29 +++++++++-----<br>
6 files changed, 74 insertions(+), 32 deletions(-)<br>
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args<br>
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml<br>
<br>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng<br>
index 8111045..724d7d0 100644<br>
--- a/docs/schemas/domaincommon.rng<br>
+++ b/docs/schemas/domaincommon.rng<br>
@@ -130,9 +130,15 @@<br>
</interleave><br>
</group><br>
<group><br>
+ <!-- with none, relabel must be no if present --><br>
<attribute name='type'><br>
<value>none</value><br>
</attribute><br>
+ <optional><br>
+ <attribute name='relabel'><br>
+ <value>no</value><br>
+ </attribute><br>
+ </optional><br>
</group><br>
</choice><br>
</element><br>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c<br>
index aa4b32d..6949ece 100644<br>
--- a/src/conf/domain_conf.c<br>
+++ b/src/conf/domain_conf.c<br>
@@ -2583,17 +2583,15 @@ virSecurityLabelDefParseXML(virSecurityLabelDefPtr def,<br>
p = virXPathStringLimit("string(./seclabel/@type)",<br>
VIR_SECURITY_LABEL_BUFLEN-1, ctxt);<br>
if (p == NULL) {<br>
- virDomainReportError(VIR_ERR_XML_ERROR,<br>
- "%s", _("missing security type"));<br>
- goto error;<br>
- }<br>
-<br>
- def->type = virDomainSeclabelTypeFromString(p);<br>
- VIR_FREE(p);<br>
- if (def->type <= 0) {<br>
- virDomainReportError(VIR_ERR_XML_ERROR,<br>
- "%s", _("invalid security type"));<br>
- goto error;<br>
+ def->type = VIR_DOMAIN_SECLABEL_DYNAMIC;<br>
+ } else {<br>
+ def->type = virDomainSeclabelTypeFromString(p);<br>
+ VIR_FREE(p);<br>
+ if (def->type <= 0) {<br>
+ virDomainReportError(VIR_ERR_XML_ERROR,<br>
+ "%s", _("invalid security type"));<br>
+ goto error;<br>
+ }<br>
}<br>
<br>
p = virXPathStringLimit("string(./seclabel/@relabel)",<br>
@@ -2634,7 +2632,8 @@ virSecurityLabelDefParseXML(virSecurityLabelDefPtr def,<br>
* if the 'live' VM XML is requested<br>
*/<br>
if (def->type == VIR_DOMAIN_SECLABEL_STATIC ||<br>
- !(flags & VIR_DOMAIN_XML_INACTIVE)) {<br>
+ (!(flags & VIR_DOMAIN_XML_INACTIVE) &&<br>
+ def->type != VIR_DOMAIN_SECLABEL_NONE)) {<br>
p = virXPathStringLimit("string(./seclabel/label[1])",<br>
VIR_SECURITY_LABEL_BUFLEN-1, ctxt);<br>
if (p == NULL) {<br>
@@ -2648,7 +2647,8 @@ virSecurityLabelDefParseXML(virSecurityLabelDefPtr def,<br>
<br>
/* Only parse imagelabel, if requested live XML with relabeling */<br>
if (!def->norelabel &&<br>
- !(flags & VIR_DOMAIN_XML_INACTIVE)) {<br>
+ (!(flags & VIR_DOMAIN_XML_INACTIVE) &&<br>
+ def->type != VIR_DOMAIN_SECLABEL_NONE)) {<br>
p = virXPathStringLimit("string(./seclabel/imagelabel[1])",<br>
VIR_SECURITY_LABEL_BUFLEN-1, ctxt);<br>
if (p == NULL) {<br>
@@ -2659,16 +2659,11 @@ virSecurityLabelDefParseXML(virSecurityLabelDefPtr def,<br>
def->imagelabel = p;<br>
}<br>
<br>
- /* Only parse baselabel, for dynamic or none label types */<br>
- if (def->type == VIR_DOMAIN_SECLABEL_DYNAMIC ||<br>
- def->type == VIR_DOMAIN_SECLABEL_NONE) {<br>
+ /* Only parse baselabel for dynamic label type */<br>
+ if (def->type == VIR_DOMAIN_SECLABEL_DYNAMIC) {<br>
p = virXPathStringLimit("string(./seclabel/baselabel[1])",<br>
VIR_SECURITY_LABEL_BUFLEN-1, ctxt);<br>
- if (p != NULL) {<br>
- def->baselabel = p;<br>
- /* Forces none type to dynamic for back compat */<br>
- def->type = VIR_DOMAIN_SECLABEL_DYNAMIC;<br>
- }<br>
+ def->baselabel = p;<br>
}<br>
<br>
/* Only parse model, if static labelling, or a base<br>
@@ -2676,7 +2671,8 @@ virSecurityLabelDefParseXML(virSecurityLabelDefPtr def,<br>
*/<br>
if (def->type == VIR_DOMAIN_SECLABEL_STATIC ||<br>
def->baselabel ||<br>
- !(flags & VIR_DOMAIN_XML_INACTIVE)) {<br>
+ (!(flags & VIR_DOMAIN_XML_INACTIVE) &&<br>
+ def->type != VIR_DOMAIN_SECLABEL_NONE)) {<br>
p = virXPathStringLimit("string(./seclabel/@model)",<br>
VIR_SECURITY_MODEL_BUFLEN-1, ctxt);<br>
if (p == NULL) {<br>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args<br>
new file mode 100644<br>
index 0000000..651793d<br>
--- /dev/null<br>
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args<br>
@@ -0,0 +1,4 @@<br>
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \<br>
+pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor,\<br>
+server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \<br>
+none -parallel none -usb<br>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml<br>
new file mode 100644<br>
index 0000000..1ef97ce<br>
--- /dev/null<br>
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml<br>
@@ -0,0 +1,26 @@<br>
+<domain type='qemu'><br>
+ <name>QEMUGuest1</name><br>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid><br>
+ <memory>219100</memory><br>
+ <currentMemory>219100</currentMemory><br>
+ <vcpu cpuset='1-4,8-20,525'>1</vcpu><br>
+ <os><br>
+ <type arch='i686' machine='pc'>hvm</type><br>
+ <boot dev='hd'/><br>
+ </os><br>
+ <clock offset='utc'/><br>
+ <on_poweroff>destroy</on_poweroff><br>
+ <on_reboot>restart</on_reboot><br>
+ <on_crash>destroy</on_crash><br>
+ <devices><br>
+ <emulator>/usr/bin/qemu</emulator><br>
+ <disk type='block' device='disk'><br>
+ <source dev='/dev/HostVG/QEMUGuest1'/><br>
+ <target dev='hda' bus='ide'/><br>
+ <address type='drive' controller='0' bus='0' unit='0'/><br>
+ </disk><br>
+ <controller type='ide' index='0'/><br>
+ <memballoon model='virtio'/><br>
+ </devices><br>
+ <seclabel type='none' relabel='no'/><br>
+</domain><br>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c<br>
index c8ce77f..fcffc27 100644<br>
--- a/tests/qemuxml2argvtest.c<br>
+++ b/tests/qemuxml2argvtest.c<br>
@@ -728,6 +728,7 @@ mymain(void)<br>
DO_TEST("seclabel-dynamic-override", false, QEMU_CAPS_NAME);<br>
DO_TEST("seclabel-static", false, QEMU_CAPS_NAME);<br>
DO_TEST("seclabel-static-relabel", false, QEMU_CAPS_NAME);<br>
+ DO_TEST("seclabel-none", false, QEMU_CAPS_NAME);<br>
<br>
DO_TEST("pseries-basic", false,<br>
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);<br>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c<br>
index b0f80d3..ddc7cae 100644<br>
--- a/tests/qemuxml2xmltest.c<br>
+++ b/tests/qemuxml2xmltest.c<br>
@@ -19,7 +19,7 @@<br>
static struct qemud_driver driver;<br>
<br>
static int<br>
-testCompareXMLToXMLFiles(const char *inxml, const char *outxml)<br>
+testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live)<br>
{<br>
char *inXmlData = NULL;<br>
char *outXmlData = NULL;<br>
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)<br>
<br>
if (!(def = virDomainDefParseString(driver.caps, inXmlData,<br>
QEMU_EXPECTED_VIRT_TYPES,<br>
- VIR_DOMAIN_XML_INACTIVE)))<br>
+ live ? 0 : VIR_DOMAIN_XML_INACTIVE)))<br>
goto fail;<br>
<br>
if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE)))<br>
@@ -58,6 +58,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)<br>
struct testInfo {<br>
const char *name;<br>
int different;<br>
+ bool inactive_only;<br>
};<br>
<br>
static int<br>
@@ -75,9 +76,16 @@ testCompareXMLToXMLHelper(const void *data)<br>
goto cleanup;<br>
<br>
if (info->different) {<br>
- ret = testCompareXMLToXMLFiles(xml_in, xml_out);<br>
+ ret = testCompareXMLToXMLFiles(xml_in, xml_out, false);<br>
} else {<br>
- ret = testCompareXMLToXMLFiles(xml_in, xml_in);<br>
+ ret = testCompareXMLToXMLFiles(xml_in, xml_in, false);<br>
+ }<br>
+ if (!info->inactive_only) {<br>
+ if (info->different) {<br>
+ ret = testCompareXMLToXMLFiles(xml_in, xml_out, true);<br>
+ } else {<br>
+ ret = testCompareXMLToXMLFiles(xml_in, xml_in, true);<br>
+ }<br>
}<br>
<br>
cleanup:<br>
@@ -95,19 +103,19 @@ mymain(void)<br>
if ((driver.caps = testQemuCapsInit()) == NULL)<br>
return (EXIT_FAILURE);<br>
<br>
-# define DO_TEST_FULL(name, is_different) \<br>
+# define DO_TEST_FULL(name, is_different, inactive) \<br>
do { \<br>
- const struct testInfo info = {name, is_different}; \<br>
+ const struct testInfo info = {name, is_different, inactive}; \<br>
if (virtTestRun("QEMU XML-2-XML " name, \<br>
1, testCompareXMLToXMLHelper, &info) < 0) \<br>
ret = -1; \<br>
} while (0)<br>
<br>
# define DO_TEST(name) \<br>
- DO_TEST_FULL(name, 0)<br>
+ DO_TEST_FULL(name, 0, false)<br>
<br>
# define DO_TEST_DIFFERENT(name) \<br>
- DO_TEST_FULL(name, 1)<br>
+ DO_TEST_FULL(name, 1, false)<br>
<br>
/* Unset or set all envvars here that are copied in qemudBuildCommandLine<br>
* using ADD_ENV_COPY, otherwise these tests may fail due to unexpected<br>
@@ -200,9 +208,10 @@ mymain(void)<br>
DO_TEST("usb-redir");<br>
DO_TEST("blkdeviotune");<br>
<br>
- DO_TEST("seclabel-dynamic-baselabel");<br>
- DO_TEST("seclabel-dynamic-override");<br>
+ DO_TEST_FULL("seclabel-dynamic-baselabel", false, true);<br>
+ DO_TEST_FULL("seclabel-dynamic-override", false, true);<br>
DO_TEST("seclabel-static");<br>
+ DO_TEST("seclabel-none");<br>
<br>
/* These tests generate different XML */<br>
DO_TEST_DIFFERENT("balloon-device-auto");<br>
<span><font color="#888888">--<br>
1.7.7.6<br>
<br>
</font></span></blockquote></div><br></div>
</div></div></blockquote></div><br></div>