|
 |
3e5111 |
From e57574f1c3a506267da6676a0036bc35dbd923b3 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <e57574f1c3a506267da6676a0036bc35dbd923b3@dist-git>
|
|
|
7a3408 |
From: Eric Blake <eblake@redhat.com>
|
|
|
7a3408 |
Date: Tue, 7 Oct 2014 17:06:17 -0600
|
|
|
7a3408 |
Subject: [PATCH] RHEL: qemu: support relative backing for RHEL 7.0.z qemu
|
|
|
7a3408 |
|
|
|
7a3408 |
RHEL-only: https://bugzilla.redhat.com/show_bug.cgi?id=1150322
|
|
|
7a3408 |
|
|
|
7a3408 |
qemu-kvm-rhev for RHEL 7.0.z backported enough code to allow
|
|
|
7a3408 |
relative backing file manipulations, but could not backport
|
|
|
7a3408 |
everything from upstream. So, instead of providing the upstream
|
|
|
7a3408 |
'change-backing-file' QMP command, it added a downstream-only
|
|
|
7a3408 |
'__com.redhat_change-backing-file' as a witness that relative
|
|
|
7a3408 |
backing is supported, but not as full-featured. Since libvirt
|
|
|
7a3408 |
from RHEL 7.1 may be driving an older qemu, we need to be able
|
|
|
7a3408 |
to recognize the alternate spelling.
|
|
|
7a3408 |
|
|
|
7a3408 |
* src/qemu/qemu_capabilities.c (virQEMUCapsCommands): Also
|
|
|
7a3408 |
recognize downstream spelling.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_capabilities.c | 1 +
|
|
|
7a3408 |
1 file changed, 1 insertion(+)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
index b1245ad5d..629fc8a9b 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
@@ -1480,6 +1480,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
|
|
|
7a3408 |
{ "add-fd", QEMU_CAPS_ADD_FD },
|
|
|
7a3408 |
{ "nbd-server-start", QEMU_CAPS_NBD_SERVER },
|
|
|
7a3408 |
{ "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
|
|
|
7a3408 |
+ { "__com.redhat_change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
|
|
|
7a3408 |
{ "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
|
|
|
6ae9ed |
{ "migrate-incoming", QEMU_CAPS_INCOMING_DEFER },
|
|
|
3e5111 |
{ "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
|
|
|
7a3408 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
7a3408 |
|