External/libvirt
1
0
Fork 0
Code

Remove code handling the QEMU_CAPS_DOMID capability

Browse Source 
This option is xenner-only (since commit b81a7ece),
and we dropped support for xenner in commit de9be0a.
This commit is contained in:
Ján Tomko 2015-02-18 16:33:50 +01:00
parent 9aa316612a
commit 92572c3d71
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_command.c
View File

@ -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);

3
tests/qemuxml2argvtest.c
View File

@ -287,9 +287,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; 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)); memset(&monitor_chr, 0, sizeof(monitor_chr));

3
tests/qemuxmlnstest.c
View File

@ -84,9 +84,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail; 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)); memset(&monitor_chr, 0, sizeof(monitor_chr));