提交 92572c3d 编写于 作者: J Ján Tomko

Remove code handling the QEMU_CAPS_DOMID capability

This option is xenner-only (since commit b81a7ece),
and we dropped support for xenner in commit de9be0ab.
上级 9aa31661
...@@ -8449,10 +8449,7 @@ qemuBuildCommandLine(virConnectPtr conn, ...@@ -8449,10 +8449,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (def->virtType == VIR_DOMAIN_VIRT_XEN || if (def->virtType == VIR_DOMAIN_VIRT_XEN ||
STREQ(def->os.type, "xen") || STREQ(def->os.type, "xen") ||
STREQ(def->os.type, "linux")) { STREQ(def->os.type, "linux")) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DOMID)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) {
virCommandAddArg(cmd, "-domid");
virCommandAddArgFormat(cmd, "%d", def->id);
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) {
virCommandAddArg(cmd, "-xen-attach"); virCommandAddArg(cmd, "-xen-attach");
virCommandAddArg(cmd, "-xen-domid"); virCommandAddArg(cmd, "-xen-domid");
virCommandAddArgFormat(cmd, "%d", def->id); virCommandAddArgFormat(cmd, "%d", def->id);
......
...@@ -287,10 +287,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -287,10 +287,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
} }
if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID)) vmdef->id = -1;
vmdef->id = 6;
else
vmdef->id = -1;
memset(&monitor_chr, 0, sizeof(monitor_chr)); memset(&monitor_chr, 0, sizeof(monitor_chr));
monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX; monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX;
......
...@@ -84,10 +84,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -84,10 +84,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail; goto fail;
} }
if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID)) vmdef->id = -1;
vmdef->id = 6;
else
vmdef->id = -1;
memset(&monitor_chr, 0, sizeof(monitor_chr)); memset(&monitor_chr, 0, sizeof(monitor_chr));
monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX; monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册