External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: check for reboot-timeout on monitor

Browse Source 
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@redhat.com>
This commit is contained in:
Martin Kletzander 2013-12-13 14:51:24 +01:00
parent 5ed324a205
commit 15275f2edb
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -2284,6 +2284,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD },
{ "realtime", "mlock", QEMU_CAPS_MLOCK }, { "realtime", "mlock", QEMU_CAPS_MLOCK },
{ "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT },
{ "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
}; };
static int static int

1
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
View File

@ -133,4 +133,5 @@
<flag name='kvm-pit-lost-tick-policy'/> <flag name='kvm-pit-lost-tick-policy'/>
<flag name='boot-strict'/> <flag name='boot-strict'/>
<flag name='pvpanic'/> <flag name='pvpanic'/>
<flag name='reboot-timeout'/>
</qemuCaps> </qemuCaps>

1
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
View File

@ -137,4 +137,5 @@
<flag name='kvm-pit-lost-tick-policy'/> <flag name='kvm-pit-lost-tick-policy'/>
<flag name='boot-strict'/> <flag name='boot-strict'/>
<flag name='pvpanic'/> <flag name='pvpanic'/>
<flag name='reboot-timeout'/>
</qemuCaps> </qemuCaps>

1
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
View File

@ -136,4 +136,5 @@
<flag name='kvm-pit-lost-tick-policy'/> <flag name='kvm-pit-lost-tick-policy'/>
<flag name='boot-strict'/> <flag name='boot-strict'/>
<flag name='pvpanic'/> <flag name='pvpanic'/>
<flag name='reboot-timeout'/>
</qemuCaps> </qemuCaps>