From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 18 Feb 2015 15:33:50 +0000 (+0100)
Subject: Remove code handling the QEMU_CAPS_DOMID capability
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=92572c3d71bd08e6dd1897c7b14be9d27df608e9;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Remove code handling the QEMU_CAPS_DOMID capability

This option is xenner-only (since commit b81a7ece),
and we dropped support for xenner in commit de9be0a.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 32f17aa9f..490120580 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8449,10 +8449,7 @@ qemuBuildCommandLine(virConnectPtr conn,
     if (def->virtType == VIR_DOMAIN_VIRT_XEN ||
         STREQ(def->os.type, "xen") ||
         STREQ(def->os.type, "linux")) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DOMID)) {
-            virCommandAddArg(cmd, "-domid");
-            virCommandAddArgFormat(cmd, "%d", def->id);
-        } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) {
             virCommandAddArg(cmd, "-xen-attach");
             virCommandAddArg(cmd, "-xen-domid");
             virCommandAddArgFormat(cmd, "%d", def->id);
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 50283862c..582671ed4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -287,10 +287,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
         goto out;
     }
 
-    if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID))
-        vmdef->id = 6;
-    else
-        vmdef->id = -1;
+    vmdef->id = -1;
 
     memset(&monitor_chr, 0, sizeof(monitor_chr));
     monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX;
diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c
index 4220737e8..09b3d3199 100644
--- a/tests/qemuxmlnstest.c
+++ b/tests/qemuxmlnstest.c
@@ -84,10 +84,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
             goto fail;
     }
 
-    if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID))
-        vmdef->id = 6;
-    else
-        vmdef->id = -1;
+    vmdef->id = -1;
 
     memset(&monitor_chr, 0, sizeof(monitor_chr));
     monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX;