[libvirt] [PATCH v2 11/17] qemu: really remove last traces of Xenner support

[Daniel P. Berrange]

We have twice previously attempted to remove Xenner
support

  commit de9be0ab4d7abe4c3ae5beaaff7ddb208921f1f1
  Author: Daniel P. Berrange <berrange at redhat.com>
  Date:   Wed Aug 22 17:29:01 2012 +0100

    Remove xenner support

  commit 92572c3d71bd08e6dd1897c7b14be9d27df608e9
  Author: Ján Tomko <jtomko at redhat.com>
  Date:   Wed Feb 18 16:33:50 2015 +0100

    Remove code handling the QEMU_CAPS_DOMID capability

This change really does remove the last traces of it
in the capabilities handling code

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 src/qemu/qemu_capabilities.c |  4 ----
 src/qemu/qemu_capabilities.h |  4 ++--
 src/qemu/qemu_command.c      | 14 ++++----------
 tests/qemuhelptest.c         |  4 ----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index eb7dac2..2346e40 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1096,10 +1096,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM);
     if (strstr(help, ",process="))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
-    if (strstr(help, "-xen-domid"))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID);
-    else if (strstr(help, "-domid"))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_DOMID);
 
     cache = strstr(help, "cache=");
     if (cache && (p = strchr(cache, ']'))) {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6433328..e13c33d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -55,7 +55,7 @@ typedef enum {
     /* 5 */
     X_QEMU_CAPS_NAME, /* Is the -name flag available */
     X_QEMU_CAPS_UUID, /* Is the -uuid flag available */
-    QEMU_CAPS_DOMID, /* Xenner: -domid flag available */
+    X_QEMU_CAPS_DOMID, /* Xenner: -domid flag available */
     QEMU_CAPS_VNET_HDR,
     QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */
 
@@ -74,7 +74,7 @@ typedef enum {
     QEMU_CAPS_DRIVE_SERIAL, /* -driver serial=  available */
 
     /* 20 */
-    QEMU_CAPS_XEN_DOMID, /* -xen-domid */
+    X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */
     QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
     QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
     QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c482253..ffd4e53 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9464,16 +9464,10 @@ qemuBuildCommandLine(virConnectPtr conn,
     if (def->virtType == VIR_DOMAIN_VIRT_XEN ||
         def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
         def->os.type == VIR_DOMAIN_OSTYPE_LINUX) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) {
-            virCommandAddArg(cmd, "-xen-attach");
-            virCommandAddArg(cmd, "-xen-domid");
-            virCommandAddArgFormat(cmd, "%d", def->id);
-        } else {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("qemu emulator '%s' does not support xen"),
-                           def->emulator);
-            goto error;
-        }
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("qemu emulator '%s' does not support xen"),
+                       def->emulator);
+        goto error;
     }
 
     if ((def->os.smbios_mode != VIR_DOMAIN_SMBIOS_NONE) &&
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index e5b7b7c..414c874 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -162,7 +162,6 @@ mymain(void)
             QEMU_CAPS_0_10,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
-            QEMU_CAPS_XEN_DOMID,
             QEMU_CAPS_MIGRATE_QEMU_UNIX,
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_BALLOON,
@@ -288,7 +287,6 @@ mymain(void)
             QEMU_CAPS_KVM,
             QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_XEN_DOMID,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
             QEMU_CAPS_0_10,
@@ -493,7 +491,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_XEN_DOMID,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
             QEMU_CAPS_0_10,
@@ -581,7 +578,6 @@ mymain(void)
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
             QEMU_CAPS_DRIVE_FORMAT,
             QEMU_CAPS_DRIVE_SERIAL,
-            QEMU_CAPS_XEN_DOMID,
             QEMU_CAPS_DRIVE_READONLY,
             QEMU_CAPS_VGA,
             QEMU_CAPS_0_10,
-- 
2.5.0