[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCHv2 12/15] blockjob: accommodate RHEL backport names



RHEL-only

drive-mirror and drive-reopen are still under upstream qemu
discussion; as a result, RHEL decided to backport things under
a downstream name.  Accommodate this alternate spelling.  I
don't think it's worth trying to support both spellings at once.

* src/qemu/qemu_monitor_json.c (qemuMonitorJSONCheckCommands):
Check for alternate spelling.
(int qemuMonitorJSONDriveMirror, qemuMonitorJSONDriveReopen): Use
that spelling.
---
 src/qemu/qemu_monitor_json.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6cf0779..bb819b0 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -973,9 +973,9 @@ qemuMonitorJSONCheckCommands(qemuMonitorPtr mon,
             qemuCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
         else if (STREQ(name, "transaction"))
             qemuCapsSet(qemuCaps, QEMU_CAPS_TRANSACTION);
-        else if (STREQ(name, "drive-mirror"))
+        else if (STREQ(name, "__com.redhat_drive-mirror"))
             qemuCapsSet(qemuCaps, QEMU_CAPS_DRIVE_MIRROR);
-        else if (STREQ(name, "drive-reopen"))
+        else if (STREQ(name, "__com.redhat_drive-reopen"))
             qemuCapsSet(qemuCaps, QEMU_CAPS_DRIVE_REOPEN);
     }

@@ -3203,7 +3203,7 @@ qemuMonitorJSONDriveMirror(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
     virJSONValuePtr cmd;

     cmd = qemuMonitorJSONMakeCommandRaw(true,
-                                        "drive-mirror",
+                                        "__com.redhat_drive-mirror",
                                         "s:device", device,
                                         "s:target", file,
                                         "s:format", format,
@@ -3263,7 +3263,7 @@ qemuMonitorJSONDriveReopen(qemuMonitorPtr mon,  const char *device,
     virJSONValuePtr cmd;
     virJSONValuePtr reply = NULL;

-    cmd = qemuMonitorJSONMakeCommand("drive-reopen",
+    cmd = qemuMonitorJSONMakeCommand("__com.redhat_drive-reopen",
                                      "s:device", device,
                                      "s:new-image-file", file,
                                      "s:format", format,
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]