[libvirt] [PATCH 2/5] Remove code handling the QEMU_CAPS_DOMID capability
This option is xenner-only, and we dropped support for xenner
in commit de9be0a.
---
src/qemu/qemu_command.c | 5 +----
tests/qemuxml2argvtest.c | 5 +----
tests/qemuxmlnstest.c | 5 +----
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b522bdc..3658d5f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8408,10 +8408,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 1071dba..ba1813c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -289,10 +289,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 a068135..cc290cd 100644
--- a/tests/qemuxmlnstest.c
+++ b/tests/qemuxmlnstest.c
@@ -86,10 +86,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;
--
2.0.5