qemu: Always assume QEMU_CAPS_REBOOT_TIMEOUT

Supported since ac05f34924 ("add a boot parameter to set reboot
timeout") released in qemu-v1.3.0 and can't be compiled out.

Assume that it's present and remove the validation code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 6b1a0f6c02939dd3b1e656cfba4fea15d8debce1..8d5995057ebb99ac3614e25f5472e334f6e45d30 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -598,15 +598,6 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
         }
     }
 
-    if (def->os.bios.rt_set) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("reboot timeout is not supported "
-                             "by this QEMU binary"));
-            return -1;
-        }
-    }
-
     if (def->os.bm_timeout_set) {
         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ed1996578b93c5c163bfffa1dd2fe49b2cf1e92f..2a4f3ca2f06ff141d7bb50435b77f782a05d6d20 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1174,8 +1174,8 @@ mymain(void)
     driver.config->nogfxAllowHostAudio = false;
     g_unsetenv("QEMU_AUDIO_DRV");
 
-    DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT);
-    DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT);
+    DO_TEST_NOCAPS("reboot-timeout-disabled");
+    DO_TEST_NOCAPS("reboot-timeout-enabled");
 
     DO_TEST("bios",
             QEMU_CAPS_DEVICE_ISA_SERIAL);

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b88f7c404d9ef2712e5c51d29420e4e1a940eedf..3e51533f85a77f83064918b78d302adeb996e10a 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -233,8 +233,8 @@ mymain(void)
     DO_TEST_NOCAPS("boot-menu-disable-with-timeout");
     DO_TEST_NOCAPS("boot-order");
 
-    DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT);
-    DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT);
+    DO_TEST_NOCAPS("reboot-timeout-enabled");
+    DO_TEST_NOCAPS("reboot-timeout-disabled");
 
     DO_TEST_NOCAPS("clock-utc");
     DO_TEST_NOCAPS("clock-localtime");