]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Introduce NBD_SERVER capability
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 21 Nov 2012 13:28:44 +0000 (14:28 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Sat, 23 Feb 2013 06:33:43 +0000 (07:33 +0100)
This just keeps track whether qemu knows nbd-server-* commands
so we can use it during migration or not.

src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h

index af52bbf63bba9de2229eff1dd7080a46b898baa6..35a714d426f618146bb639351015ccbe489915a2 100644 (file)
@@ -205,7 +205,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "usb-serial", /* 125 */
               "usb-net",
               "add-fd",
-
+              "nbd-server",
     );
 
 struct _virQEMUCaps {
@@ -1940,6 +1940,8 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT);
         else if (STREQ(name, "add-fd"))
             virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD);
+        else if (STREQ(name, "nbd-server-start"))
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER);
         VIR_FREE(name);
     }
     VIR_FREE(commands);
index e69d558e24bb268711cc018b632b13be01f118d7..7c55dc8cd126df8316b4fa00237c50b2ad62ae8e 100644 (file)
@@ -166,6 +166,7 @@ enum virQEMUCapsFlags {
     QEMU_CAPS_DEVICE_USB_SERIAL  = 125, /* -device usb-serial */
     QEMU_CAPS_DEVICE_USB_NET     = 126, /* -device usb-net */
     QEMU_CAPS_ADD_FD             = 127, /* -add-fd */
+    QEMU_CAPS_NBD_SERVER         = 128, /* nbd-server-start QMP command */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };