|
 |
c401cc |
From 745fbcc2030de7f0524e351b2cf00101dedeebc0 Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <745fbcc2030de7f0524e351b2cf00101dedeebc0.1387385060.git.jdenemar@redhat.com>
|
|
|
c401cc |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c401cc |
Date: Fri, 13 Dec 2013 16:27:32 +0100
|
|
|
c401cc |
Subject: [PATCH] qemu: check for reboot-timeout on monitor
|
|
|
c401cc |
|
|
|
c401cc |
The support for <boot rebootTimeout="12345"/> was added before we were
|
|
|
c401cc |
checking for qemu command line options in QMP, so we haven't properly
|
|
|
c401cc |
adapted virQEMUCaps when using it and thus we report unsupported
|
|
|
c401cc |
option with new enough qemu.
|
|
|
c401cc |
|
|
|
c401cc |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1042690
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c401cc |
(cherry picked from commit 15275f2edb88b7571163b5df7c23ac4b539be6c5)
|
|
|
c401cc |
|
|
|
c401cc |
Conflicts:
|
|
|
c401cc |
tests/qemucapabilitiesdata/caps_1.5.3-1.caps -- 63857eb4a
|
|
|
c401cc |
tests/qemucapabilitiesdata/caps_1.6.0-1.caps -- 63857eb4a
|
|
|
c401cc |
tests/qemucapabilitiesdata/caps_1.6.50-1.caps -- 63857eb4a
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
src/qemu/qemu_capabilities.c | 1 +
|
|
|
c401cc |
1 file changed, 1 insertion(+)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
c401cc |
index d31f9ff..9e0e597 100644
|
|
|
c401cc |
--- a/src/qemu/qemu_capabilities.c
|
|
|
c401cc |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
c401cc |
@@ -2242,6 +2242,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
|
|
|
c401cc |
{ "drive", "discard", QEMU_CAPS_DRIVE_DISCARD },
|
|
|
c401cc |
{ "realtime", "mlock", QEMU_CAPS_MLOCK },
|
|
|
c401cc |
{ "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT },
|
|
|
c401cc |
+ { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
|
|
|
c401cc |
};
|
|
|
c401cc |
|
|
|
c401cc |
static int
|
|
|
c401cc |
--
|
|
|
c401cc |
1.8.5.1
|
|
|
c401cc |
|