qemu: check for reboot-timeout on monitor

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>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 62622d087e7cdbf9a4649c52a3673e80a157ac21..5e9c65eec3e0e4c2893b14893c0a23e923d56b61 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2284,6 +2284,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 7ca2c6547d1b03eff11c925a7e5fa23db79799ea..1e5bb746901a57c430e66c8ffc161d9fa334132c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -133,4 +133,5 @@
     <flag name='kvm-pit-lost-tick-policy'/>
     <flag name='boot-strict'/>
     <flag name='pvpanic'/>
+    <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 dcbf5d5ef421c19421f1c423eb7d6fca33ebe4d6..c7ce591ca752fa40b0f74fb812bb359397bac959 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -137,4 +137,5 @@
     <flag name='kvm-pit-lost-tick-policy'/>
     <flag name='boot-strict'/>
     <flag name='pvpanic'/>
+    <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 1159f59954f8ec7d8c03eab8610a62d5bee78e72..ba641772addbe696e33e0d95b7e94378ce0e3be0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -136,4 +136,5 @@
     <flag name='kvm-pit-lost-tick-policy'/>
     <flag name='boot-strict'/>
     <flag name='pvpanic'/>
+    <flag name='reboot-timeout'/>
   </qemuCaps>