From 745fbcc2030de7f0524e351b2cf00101dedeebc0 Mon Sep 17 00:00:00 2001
Message-Id: <745fbcc2030de7f0524e351b2cf00101dedeebc0.1387385060.git.jdenemar@redhat.com>
From: Martin Kletzander <mkletzan@redhat.com>
Date: Fri, 13 Dec 2013 16:27:32 +0100
Subject: [PATCH] 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>
(cherry picked from commit 15275f2edb88b7571163b5df7c23ac4b539be6c5)

Conflicts:
	tests/qemucapabilitiesdata/caps_1.5.3-1.caps  -- 63857eb4a
	tests/qemucapabilitiesdata/caps_1.6.0-1.caps  -- 63857eb4a
	tests/qemucapabilitiesdata/caps_1.6.50-1.caps -- 63857eb4a

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_capabilities.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d31f9ff..9e0e597 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2242,6 +2242,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
-- 
1.8.5.1