ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: remove iommu property 

Since iommu devices can be created with '-device' there is
no need to keep iommu as machine and mch property.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2016-06-27 18:38:35 +03:00 committed by Michael S. Tsirkin
parent 621d983a1f
commit 10d01f73e3
4 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/core/machine.c
View File

@ -300,20 +300,6 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp)
ms->firmware = g_strdup(value); ms->firmware = g_strdup(value);
} }
static bool machine_get_iommu(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);
return ms->iommu;
}
static void machine_set_iommu(Object *obj, bool value, Error **errp)
{
MachineState *ms = MACHINE(obj);
ms->iommu = value;
}
static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp) static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp)
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
@ -493,12 +479,6 @@ static void machine_initfn(Object *obj)
object_property_set_description(obj, "firmware", object_property_set_description(obj, "firmware",
"Firmware image", "Firmware image",
NULL); NULL);
object_property_add_bool(obj, "iommu",
machine_get_iommu,
machine_set_iommu, NULL);
object_property_set_description(obj, "iommu",
"Set on/off to enable/disable Intel IOMMU (VT-d)",
NULL);
object_property_add_bool(obj, "suppress-vmdesc", object_property_add_bool(obj, "suppress-vmdesc",
machine_get_suppress_vmdesc, machine_get_suppress_vmdesc,
machine_set_suppress_vmdesc, NULL); machine_set_suppress_vmdesc, NULL);

12
hw/pci-host/q35.c
View File

@ -447,14 +447,6 @@ static void mch_reset(DeviceState *qdev)
mch_update(mch); mch_update(mch);
} }
static void mch_init_dmar(MCHPCIState *mch)
{
mch->iommu = INTEL_IOMMU_DEVICE(qdev_create(NULL, TYPE_INTEL_IOMMU_DEVICE));
object_property_add_child(OBJECT(mch), "intel-iommu",
OBJECT(mch->iommu), NULL);
qdev_init_nofail(DEVICE(mch->iommu));
}
static void mch_realize(PCIDevice *d, Error **errp) static void mch_realize(PCIDevice *d, Error **errp)
{ {
int i; int i;
@ -513,10 +505,6 @@ static void mch_realize(PCIDevice *d, Error **errp)
mch->pci_address_space, &mch->pam_regions[i+1], mch->pci_address_space, &mch->pam_regions[i+1],
PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
} }
/* Intel IOMMU (VT-d) */
if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) {
mch_init_dmar(mch);
}
} }
uint64_t mch_mcfg_base(void) uint64_t mch_mcfg_base(void)

1
include/hw/pci-host/q35.h
View File

@ -60,7 +60,6 @@ typedef struct MCHPCIState {
uint64_t above_4g_mem_size; uint64_t above_4g_mem_size;
uint64_t pci_hole64_size; uint64_t pci_hole64_size;
uint32_t short_root_bus; uint32_t short_root_bus;
IntelIOMMUState *iommu;
} MCHPCIState; } MCHPCIState;
typedef struct Q35PCIHost { typedef struct Q35PCIHost {

3
qemu-options.hx
View File

@ -38,7 +38,6 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" kvm_shadow_mem=size of KVM shadow MMU in bytes\n" " kvm_shadow_mem=size of KVM shadow MMU in bytes\n"
" dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n"
" mem-merge=on|off controls memory merge support (default: on)\n" " mem-merge=on|off controls memory merge support (default: on)\n"
" iommu=on|off controls emulated Intel IOMMU (VT-d) support (default=off)\n"
" igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n" " igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n"
" aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n"
" dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n"
@ -73,8 +72,6 @@ Include guest memory in a core dump. The default is on.
Enables or disables memory merge support. This feature, when supported by Enables or disables memory merge support. This feature, when supported by
the host, de-duplicates identical memory pages among VMs instances the host, de-duplicates identical memory pages among VMs instances
(enabled by default). (enabled by default).
@item iommu=on|off
Enables or disables emulated Intel IOMMU (VT-d) support. The default is off.
@item aes-key-wrap=on|off @item aes-key-wrap=on|off
Enables or disables AES key wrapping support on s390-ccw hosts. This feature Enables or disables AES key wrapping support on s390-ccw hosts. This feature
controls whether AES wrapping keys will be created to allow controls whether AES wrapping keys will be created to allow