diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 32f17aa9fa..4901205806 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 50283862c7..582671ed47 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 4220737e84..09b3d31996 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;