- Devel - libvirt List Archives

[libvirt] [PATCH] Fix detection of JSON when restarting libvirtd
by Daniel P. Berrange 11 Dec '09

11 Dec '09

The XML XPath for detecting JSON in the running VM statefile was wrong causing all VMs to get JSON mode enabled at libvirtd restart. In addition if a VM was running a JSON enabled QEMU once, and then altered to point to a non-JSON enabled QEMU later the 'monJSON' flag would not get reset to 0. * src/qemu/qemu_driver.c: Fix setting/detection of JSON mode --- src/qemu/qemu_driver.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0dccae6..3661ef0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -220,8 +220,11 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY; VIR_FREE(tmp); - if (virXPathBoolean(NULL, "int(./monitor[1]/@json)", ctxt)) + if (virXPathBoolean(NULL, "count(./monitor[@json = '1']) > 0", ctxt)) { priv->monJSON = 1; + } else { + priv->monJSON = 0; + } switch (priv->monConfig->type) { case VIR_DOMAIN_CHR_TYPE_PTY: @@ -2361,7 +2364,9 @@ static int qemudStartVMDaemon(virConnectPtr conn, #if HAVE_YAJL if (qemuCmdFlags & QEMUD_CMD_FLAG_MONITOR_JSON) priv->monJSON = 1; + else #endif + priv->monJSON = 0; if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) { virReportSystemError(conn, ret, -- 1.6.5.2

2 1

[libvirt] [PATCH v2 0/3] Fix migration of paused VMs
by Paolo Bonzini 11 Dec '09

11 Dec '09

This is the final version of QEMU support for migrating paused VMs. The patch series is the same as what I posted on Nov 25, except for the check on the return value of virDomainGetInfo. Patch 2 also had some easily-solved conflicts upon rebasing. I haven't yet implemented an error message when inactive domains are migrated; I'll do so in a follow-up patch. Paolo include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 15 ++++++++++++++- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++------------- src/xen/xend_internal.c | 9 +++++++++ tools/virsh.c | 5 ++++- tools/virsh.pod | 7 ++++--- 6 files changed, 56 insertions(+), 18 deletions(-) Paolo Bonzini (3): fix migration of paused vms upon failure add virsh --suspend retrieve paused/running state at the beginning of migration

3 5

[libvirt] [PATCH] Replace <optional><oneOrMore> with <zeroOrMore>.
by Diego Elio 'Flameeyes' Pettenò 11 Dec '09

11 Dec '09

The two syntax should be equivalent, but the former creates, with trang, an invalid Relax-NG Compact form file, as the output will contain the sequence "+?" which is not recognized by tools like rnv. --- docs/schemas/domain.rng | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 5b8f7f8..d1d3efb 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -980,27 +980,25 @@ </attribute> </define> <define name="qemucdevSrcDef"> - <optional> - <oneOrMore> - <element name="source"> - <optional> - <attribute name="mode"/> - </optional> - <optional> - <attribute name="path"/> - </optional> - <optional> - <attribute name="host"/> - </optional> - <optional> - <attribute name="service"/> - </optional> - <optional> - <attribute name="wiremode"/> - </optional> - </element> - </oneOrMore> - </optional> + <zeroOrMore> + <element name="source"> + <optional> + <attribute name="mode"/> + </optional> + <optional> + <attribute name="path"/> + </optional> + <optional> + <attribute name="host"/> + </optional> + <optional> + <attribute name="service"/> + </optional> + <optional> + <attribute name="wiremode"/> + </optional> + </element> + </zeroOrMore> <optional> <element name="protocol"> <optional> -- 1.6.5.5

2 1

[libvirt] [PATCH] Remove iptables.c from POTFILES.in
by Matthias Bolte 11 Dec '09

11 Dec '09

--- po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index f8e9130..a429b19 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -50,7 +50,6 @@ src/uml/uml_conf.c src/uml/uml_driver.c src/util/bridge.c src/util/conf.c -src/util/iptables.c src/util/json.c src/util/logging.c src/util/pci.c -- 1.6.0.4

1 0

[libvirt] [PATCH, TCK] Install tests to /usr/share/... instead of /share/...
by Matthias Bolte 10 Dec '09

10 Dec '09

libvirt-tck expects the tests in /usr/share/libvirt-tck/tests. --- Build.PL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Build.PL b/Build.PL index 453172c..c85a072 100644 --- a/Build.PL +++ b/Build.PL @@ -100,5 +100,5 @@ my $b = $class->new( $b->add_build_element("conf"); $b->add_build_element("pkgdata"); $b->install_path('conf' => File::Spec->catdir($b->install_base, "etc", "libvirt-tck")); -$b->install_path('pkgdata' => File::Spec->catdir($b->install_base, "share", "libvirt-tck", "tests")); +$b->install_path('pkgdata' => File::Spec->catdir($b->install_base, "usr/share", "libvirt-tck", "tests")); $b->create_build_script; -- 1.6.0.4

2 1

[libvirt] [PATCH, TCK] Add missing module Test::Exception to the required module list
by Matthias Bolte 10 Dec '09

10 Dec '09

--- Build.PL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Build.PL b/Build.PL index df35abf..453172c 100644 --- a/Build.PL +++ b/Build.PL @@ -69,6 +69,7 @@ my $b = $class->new( 'TAP::Formatter::HTML' => 0, 'TAP::Harness' => 3.11, 'TAP::Harness::Archive' => 0, + 'Test::Exception' => 0, 'Test::Builder' => 0, 'Test::More' => 0, 'Sub::Uplevel' => 0, -- 1.6.0.4

2 1

[libvirt] [PATCH] qemu driver: Fix segfault in libvirt/libvirtd when uri->path is NULL
by Richard W.M. Jones 10 Dec '09

10 Dec '09

-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 1

[libvirt] Segmentation fault when shutting down VMs
by Thomas Treutner 10 Dec '09

10 Dec '09

Hi, I'm facing another problem with latest git. This happens regularly when shutting down VM(s): http://pastebin.com/m4ef1d93f It doesn't depend on which or how many VM is/are shut down, or if I have a VNC connection to a VM that is shutting down. Sometimes after a segv, I get this: http://pastebin.com/m5260bf21 It seems to me that libvirt tries to query a qemu monitor that is no longer alive? kr,tom

3 4

[libvirt] [PATCH] Fix error in secret.rng schema.
by Diego Elio 'Flameeyes' Pettenò 10 Dec '09

10 Dec '09

Without this error the schema is not a well-formatted XML file. --- docs/schemas/secret.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng index 40e2b7f..39f8625 100644 --- a/docs/schemas/secret.rng +++ b/docs/schemas/secret.rng @@ -36,7 +36,7 @@ <optional> <element name='usage'> <choice> - <ref name='usagevolume'> + <ref name='usagevolume' />  </choice> </element> -- 1.6.5.5

2 1

[libvirt] [PATCH] Fix error in secret.rng schema.
by Diego Elio 'Flameeyes' Pettenò 10 Dec '09

10 Dec '09

With this error the schema is not a well-formed XML file. --- docs/schemas/secret.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng index 40e2b7f..39f8625 100644 --- a/docs/schemas/secret.rng +++ b/docs/schemas/secret.rng @@ -36,7 +36,7 @@ <optional> <element name='usage'> <choice> - <ref name='usagevolume'> + <ref name='usagevolume' />  </choice> </element> -- 1.6.5.5

1 0