- Devel - libvirt List Archives

[libvirt] ANNOUNCE: libvirt 1.0.5.8 maintenance release
by Cole Robinson 14 Dec '13

14 Dec '13

libvirt 1.0.5.8 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.8.tar.gz Changes in this version: * Tie SASL callbacks lifecycle to virNetSessionSASLContext * spec: Don't save/restore running VMs on libvirt-client update * Return right error code for baselineCPU * spec: Don't save/restore running VMs on libvirt-client update * Fix busy wait loop in LXC container I/O handling * libvirt-guests: Run only after libvirtd * Don't depend on syslog.service * libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities * util: recognize SMB/CIFS filesystems as shared * Disable nwfilter driver when running unprivileged * spec: Explicitly require libgcrypt-devel For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.1.3.2 maintenance release
by Cole Robinson 14 Dec '13

14 Dec '13

libvirt 1.1.3.2 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.2.tar.gz Changes in this version: * Tie SASL callbacks lifecycle to virNetSessionSASLContext * spec: Don't save/restore running VMs on libvirt-client update * Return right error code for baselineCPU * qemu: hotplug: Fix adding USB devices to the driver list * qemu: hotplug: Fix double free on USB collision * qemu: hotplug: Only label hostdev after checking device conflicts * qemu: hotplug: Mark 2 private functions as static * qemu: Call qemuSetupHostdevCGroup later during hotplug * qemu: hostdev: Refactor PCI passhrough handling * qemu: snapshot: Detect internal snapshots also for sheepdog and RBD * spec: Don't save/restore running VMs on libvirt-client update * Fix busy wait loop in LXC container I/O handling * libvirt-guests: Run only after libvirtd * Don't depend on syslog.service * Fix migration with QEMU 1.6 * libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities * util: recognize SMB/CIFS filesystems as shared * Disable nwfilter driver when running unprivileged * qemu: don't use deprecated -no-kvm-pit-reinjection * qemu: Don't access vm->priv on unlocked domain * virpci: Don't error on unbinded devices * virSecurityLabelDefParseXML: Don't parse label on model='none' For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] Return right error code for baselineCPU
by Don Dugger 14 Dec '13

14 Dec '13

This Python interface code is returning a -1 on errors for the `baselineCPU' API. Since this API is supposed to return a pointer the error return value should really be VIR_PY_NONE. NB: I've checked all the other APIs in this file and this is the only pointer API that is returning -1. Signed-off-by: Don Dugger <donald.d.dugger(a)intel.com> --- python/libvirt-override.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index c60747d..b471605 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4471,13 +4471,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, ncpus = PyList_Size(list); if (VIR_ALLOC_N_QUIET(xmlcpus, ncpus) < 0) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; for (i = 0; i < ncpus; i++) { xmlcpus[i] = PyString_AsString(PyList_GetItem(list, i)); if (xmlcpus[i] == NULL) { VIR_FREE(xmlcpus); - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; } } } @@ -4489,13 +4489,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(xmlcpus); if (base_cpu == NULL) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; pybase_cpu = PyString_FromString(base_cpu); VIR_FREE(base_cpu); if (pybase_cpu == NULL) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; return pybase_cpu; } -- 1.7.10.4 -- Don Dugger "Censeo Toto nos in Kansa esse decisse." - D. Gale n0ano(a)n0ano.com Ph: 303/443-3786

6 10

[libvirt] libvirt glusterfs problem
by Umar Draz 13 Dec '13

13 Dec '13

Hi I am running libvirt 1.2.0 on ubuntu. The main purpose of this libvirt 1.2.0 is for glusterfs, now I can define glusterfs storage pool using virsh command, but when I tried to create the volume under the gluster storage pool, I got error. error: Failed to create vol from tt.xml error: this function is not supported by the connection driver: storage pool does not support volume creation. But according to this url http://libvirt.org/storage.html we can create the volume. Any body please help me. Br. Umar

2 2

[libvirt] [PATCH] event-test: Unregister close callback
by Michal Privoznik 13 Dec '13

13 Dec '13

When registering a close callback, the connection refcount is increased as the connection object is passed to the callback and hence we must prevent deleting it too soon. However, when closing the connection, the connection object is just unrefed. So whenever a connection with a close callback is closed, we end up with the connection object which has exactly one reference. Leaving the code as-is doesn't mean the end of the world as we know it, but why give a bad example? ==14531== 288 bytes in 1 blocks are still reachable in loss record 695 of 762 ==14531== at 0x4C2BDE4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==14531== by 0x4E9FE09: virAllocVar (viralloc.c:558) ==14531== by 0x4EDBE45: virObjectNew (virobject.c:190) ==14531== by 0x4F71AAC: virGetConnect (datatypes.c:116) ==14531== by 0x4F78511: do_open (libvirt.c:1136) ==14531== by 0x4F7B3AC: virConnectOpenAuth (libvirt.c:1481) ==14531== by 0x4011D2: main (event-test.c:499) (and other leaks tied to virGetConnect()) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/object-events/event-test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index f872b9f..228a091 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -675,6 +675,8 @@ int main(int argc, char **argv) virConnectDomainEventDeregisterAny(dconn, callback8ret); } + virConnectUnregisterCloseCallback(dconn, connectClose); + VIR_DEBUG("Closing connection"); if (dconn && virConnectClose(dconn) < 0) { printf("error closing\n"); -- 1.8.5.1

2 1

[libvirt] [PATCH] qemu: always ask for -enable-fips
by Eric Blake 13 Dec '13

13 Dec '13

On a system that is enforcing FIPS, most libraries honor the current mode by default. Qemu, on the other hand, refused to honor FIPS mode unless you add the '-enable-fips' command line option; worse, this option is not discoverable via QMP, and is only present on binaries built for Linux. As far as I can tell, unconditionally using the option when it is available has no negative consequences (the option has no change to qemu behavior except when FIPS is enabled, at which point it cripples insecure VNC passwords which is the one thing that libvirt must not allow when FIPS is active). This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474 * src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit. * src/qemu/qemu_capabilities.c (virQEMUCapsInitQMPBasic): Conditionally set capability. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. * tests/qemucapabilitiestest.c (testQemuCaps): Unconditionally set capability. * tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list. * tests/qemucapabilitiesdata/caps_1.3.1-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.4.2-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.5.3-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.6.50-1.caps: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiestest.c | 6 ++++++ 10 files changed, 22 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a68e555..4d1a961 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -245,6 +245,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "kvm-pit-lost-tick-policy", "boot-strict", /* 160 */ + "enable-fips", ); struct _virQEMUCaps { @@ -2469,6 +2470,12 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); +#ifdef __linux__ + /* We always want to honor FIPS mode; but for some strange reason, + * qemu choose to require the use of a command line option, and + * worse, to provide the option only on Linux. */ + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); +#endif } /* Capabilities that are architecture depending diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index aea64ea..87489ab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -199,6 +199,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ + QEMU_CAPS_ENABLE_FIPS = 161, /* -enable-fips */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9539be7..a04725d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7747,6 +7747,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) + virCommandAddArg(cmd, "-enable-fips"); if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 73a561d..c3ae814 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -112,4 +112,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index da15d8b..7f629c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -126,4 +126,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index c419068..1111f42 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -127,4 +127,5 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 2b00449..a154bf6 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -132,4 +132,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 7bce4aa..3ccfb4f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -136,4 +136,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index bfaab9d..244985f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -135,4 +135,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index d912171..a86e070 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -192,6 +192,12 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* Unfortunately, qemu made '-enable-fips' a Linux-only option, + * with no way to probe it via QMP. But as our data files aren't + * set up to use #ifdef, we fake that the option is always present + * if we can probe QMP, even if not on Linux. */ + virQEMUCapsSet(capsComputed, QEMU_CAPS_ENABLE_FIPS); + if (testQemuCapsCompare(capsProvided, capsComputed) < 0) goto cleanup; -- 1.8.3.1

5 14

[libvirt] [PATCH] Don't call virCgroupSetCpuShares with a zero value
by Ján Tomko 13 Dec '13

13 Dec '13

In the XML parser, a zero in the <shares> element is treated as if it was omitted completely. No value is written to the cgroups fs when the domain is started and the OS default is used. virDomainSetSchedulerParameters treated 0 as a valid value, which got changed to '2' by kernel. Treat 0 as 'not specified' instead, to be consistent with the XML and how other scheduler parameters deal with a 0 value, making it a no-op on live domains. Also clarify the documentation. --- docs/formatdomain.html.in | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- tools/virsh.pod | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a094524..9749d55 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -508,7 +508,7 @@ <dt><code>shares</code></dt> <dd> The optional <code>shares</code> element specifies the proportional - weighted share for the domain. If this is omitted, it defaults to + weighted share for the domain. If this is omitted or 0, it defaults to the OS provided defaults. NB, There is no unit for the value, it's a relative measure based on the setting of other VM, e.g. A VM configured with value diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c499182..7ac3691 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1732,7 +1732,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && params[i].value.ul) { if (virCgroupSetCpuShares(priv->cgroup, params[i].value.ul) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45d11cd..eba1e1a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8583,7 +8583,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, value_l = param->value.l; if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { if (virCgroupSetCpuShares(priv->cgroup, value_ul) < 0) goto cleanup; vm->def->cputune.shares = value_ul; diff --git a/tools/virsh.pod b/tools/virsh.pod index c6a8be3..092b6ae 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1393,7 +1393,8 @@ If I<--current> is specified, affect the current guest state. B<Note>: The cpu_shares parameter has a valid value range of 0-262144; Negative values are wrapped to positive, and larger values are capped at the maximum. Therefore, -1 is a useful shorthand for 262144. On the Linux kernel, the -values 0 and 1 are automatically converted to a minimal value of 2. +value 1 is automatically converted to a minimal value of 2. The value 0 +is the same as not specifying that parameter. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>. -- 1.8.3.2

2 1

[libvirt] [PATCH 0/7 v2] Misc improvements to events code
by Daniel P. Berrange 13 Dec '13

13 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This is a followup to the recent network events patches to improve a few things I noticed when testing this out for real. In v2: - Changed the way event dispatch works to avoid race with creation of classes Daniel P. Berrange (7): Move examples/domain-events/event-c to examples/object-events Update event demo program to support network events too Add 'detail' arg to network lifecycle event internals Introduce abstract virNetworkEvent class Associate a dispatch function with the event objects Remove the event namespace concept Add debug output when registering event handlers Makefile.am | 2 +- configure.ac | 2 +- .../events-c => object-events}/Makefile.am | 0 .../events-c => object-events}/event-test.c | 45 ++++++++++- src/conf/domain_event.c | 27 +++++-- src/conf/domain_event.h | 7 -- src/conf/network_event.c | 59 ++++++++++---- src/conf/network_event.h | 9 +-- src/conf/object_event.c | 94 +++++++++------------- src/conf/object_event.h | 11 +-- src/conf/object_event_private.h | 11 ++- src/network/bridge_driver.c | 15 ++-- src/remote/remote_driver.c | 2 +- src/test/test_driver.c | 15 ++-- 14 files changed, 182 insertions(+), 117 deletions(-) rename examples/{domain-events/events-c => object-events}/Makefile.am (100%) rename examples/{domain-events/events-c => object-events}/event-test.c (94%) -- 1.8.3.1

4 24

[libvirt] [PATCH] Fix memory leak in virObjectEventCallbackListRemoveID()
by Nehal J Wani 13 Dec '13

13 Dec '13

While running objecteventtest, it was found that valgrind pointed out the following memory leak: ==13464== 5 bytes in 1 blocks are definitely lost in loss record 7 of 134 ==13464== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==13464== by 0x341F485E21: strdup (strdup.c:42) ==13464== by 0x4CAE28F: virStrdup (virstring.c:554) ==13464== by 0x4CF3CBE: virObjectEventCallbackListAddID (object_event.c:286) ==13464== by 0x4CF49CA: virObjectEventStateRegisterID (object_event.c:729) ==13464== by 0x4CF73FE: virDomainEventStateRegisterID (domain_event.c:1424) ==13464== by 0x4D7358F: testConnectDomainEventRegisterAny (test_driver.c:6032) ==13464== by 0x4D600C8: virConnectDomainEventRegisterAny (libvirt.c:19128) ==13464== by 0x402409: testDomainStartStopEvent (objecteventtest.c:232) ==13464== by 0x403451: virtTestRun (testutils.c:138) ==13464== by 0x402012: mymain (objecteventtest.c:395) ==13464== by 0x403AF2: virtTestMain (testutils.c:593) ==13464== --- Should we be introducing virObjectMetaFree() and/or virObjectEventCallbackFree() ? src/conf/object_event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index ec00aaf..399927b 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -137,6 +137,9 @@ virObjectEventCallbackListRemoveID(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virObjectUnref(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->meta) + VIR_FREE(cbList->callbacks[i]->meta->name); + VIR_FREE(cbList->callbacks[i]->meta); VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) -- 1.8.1.4

2 1

[libvirt] [PATCH] qemu: check for reboot-timeout on monitor=
by Martin Kletzander 13 Dec '13

13 Dec '13

The support for <boot rebootTimeout="12345"/> was added before we were checking for qemu command line options in QMP, so we haven't properly adapted virQEMUCaps when using it and thus we report unsupported option with new enough qemu. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1042690 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_capabilities.c | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + 4 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a68e555..b1c30db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2282,6 +2282,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, + { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, }; static int diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 2b00449..74f63c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -132,4 +132,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 7bce4aa..c82e39e 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -136,4 +136,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index bfaab9d..0f2873f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -135,4 +135,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> -- 1.8.5.1

2 3