External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: format intel-iommu,intremap on the command line

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1427005
This commit is contained in:
Ján Tomko 2017-05-03 15:23:12 +02:00
parent 2020e2c6f2
commit 04028a9db9
14 changed files with 173 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -369,6 +369,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"kernel-irqchip", /* 255 */
"kernel-irqchip.split",
"intel-iommu.intremap",
);
@ -1723,6 +1724,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = {
{ "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsIntelIOMMU[] = {
{ "intremap", QEMU_CAPS_INTEL_IOMMU_INTREMAP },
};
/* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
@ -1830,6 +1835,9 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
{ "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI),
-1 },
{ "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU),
QEMU_CAPS_DEVICE_INTEL_IOMMU},
};
struct virQEMUCapsPropTypeObjects {

1
src/qemu/qemu_capabilities.h
View File

@ -407,6 +407,7 @@ typedef enum {
/* 255 */
QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
QEMU_CAPS_INTEL_IOMMU_INTREMAP, /* intel-iommu.intremap */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;

18
src/qemu/qemu_command.c
View File

@ -6685,6 +6685,20 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd,
if (!iommu)
return 0;
switch (iommu->model) {
case VIR_DOMAIN_IOMMU_MODEL_INTEL:
if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("iommu: interrupt remapping is not supported "
"with this QEMU binary"));
return -1;
}
break;
case VIR_DOMAIN_IOMMU_MODEL_LAST:
break;
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU))
return 0; /* Already handled via -machine */
@ -6705,6 +6719,10 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd,
return -1;
}
virBufferAddLit(&opts, "intel-iommu");
if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT) {
virBufferAsprintf(&opts, ",intremap=%s",
virTristateSwitchTypeToString(iommu->intremap));
}
case VIR_DOMAIN_IOMMU_MODEL_LAST:
break;
}

22
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
View File

@ -3120,6 +3120,16 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "version",
"type": "uint32"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -3246,7 +3256,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -3336,21 +3346,21 @@
"name": "qemu64"
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -4358,7 +4368,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -4388,7 +4398,7 @@
"capability": "events"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{

24
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
View File

@ -3283,6 +3283,16 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "version",
"type": "uint32"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -3417,7 +3427,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -3507,21 +3517,21 @@
"name": "qemu64"
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -4566,7 +4576,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -4600,7 +4610,7 @@
"capability": "x-postcopy-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -12145,7 +12155,7 @@
"meta-type": "array"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

24
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
View File

@ -3365,6 +3365,16 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "version",
"type": "uint32"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -3475,7 +3485,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -3565,21 +3575,21 @@
"name": "qemu64"
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -4673,7 +4683,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -4707,7 +4717,7 @@
"capability": "postcopy-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -12712,7 +12722,7 @@
"meta-type": "array"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

28
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
View File

@ -3556,6 +3556,20 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "version",
"type": "uint32"
},
{
"name": "intremap",
"type": "bool"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -3702,7 +3716,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -3795,21 +3809,21 @@
"name": "qemu64"
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -4907,7 +4921,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -4941,7 +4955,7 @@
"capability": "postcopy-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -13297,7 +13311,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -204,6 +204,7 @@
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='kernel-irqchip.split'/>
<flag name='intel-iommu.intremap'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.7.0)</package>

37
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
View File

@ -3689,6 +3689,29 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "eim",
"description": "on/off/auto",
"type": "OnOffAuto"
},
{
"name": "x-buggy-eim",
"type": "bool"
},
{
"name": "intremap",
"type": "bool"
},
{
"name": "version",
"type": "uint32"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -3855,7 +3878,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -4061,21 +4084,21 @@
"static": false
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -5198,7 +5221,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -5236,7 +5259,7 @@
"capability": "x-colo"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -14006,7 +14029,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -205,6 +205,7 @@
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
<flag name='kernel-irqchip.split'/>
<flag name='intel-iommu.intremap'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.8.0)</package>

49
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
View File

@ -4000,6 +4000,37 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "eim",
"description": "on/off/auto",
"type": "OnOffAuto"
},
{
"name": "caching-mode",
"type": "bool"
},
{
"name": "x-buggy-eim",
"type": "bool"
},
{
"name": "intremap",
"type": "bool"
},
{
"name": "version",
"type": "uint32"
},
{
"name": "device-iotlb",
"type": "bool"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -4176,7 +4207,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -4458,21 +4489,21 @@
"migration-safe": true
}
],
"id": "libvirt-42"
"id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
"id": "libvirt-43"
"id": "libvirt-44"
}
{
"return": [
"passthrough"
],
"id": "libvirt-44"
"id": "libvirt-45"
}
{
@ -5721,7 +5752,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -5763,7 +5794,7 @@
"capability": "release-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -15049,7 +15080,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{
@ -15228,7 +15259,7 @@
}
}
},
"id": "libvirt-48"
"id": "libvirt-49"
}
{
@ -15469,7 +15500,7 @@
}
}
},
"id": "libvirt-49"
"id": "libvirt-50"
}
{

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -212,6 +212,7 @@
<flag name='qemu-xhci'/>
<flag name='kernel-irqchip'/>
<flag name='kernel-irqchip.split'/>
<flag name='intel-iommu.intremap'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.9.0)</package>

2
tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-ioapic.args
View File

@ -16,4 +16,4 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device intel-iommu
-device intel-iommu,intremap=on

1
tests/qemuxml2argvtest.c
View File

@ -2513,6 +2513,7 @@ mymain(void)
QEMU_CAPS_MACHINE_OPT,
QEMU_CAPS_MACHINE_KERNEL_IRQCHIP,
QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT,
QEMU_CAPS_INTEL_IOMMU_INTREMAP,
QEMU_CAPS_DEVICE_INTEL_IOMMU);
DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);