diff options
| author | Marcel Apfelbaum <marcel@redhat.com> | 2016-06-27 18:38:35 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-07-04 14:50:58 +0300 |
| commit | 10d01f73e39100701028c7badd6ece52990cf758 (patch) | |
| tree | e28c7e53823c0319d0437fe24a1b82ba7b2170e3 /hw/pci-host/q35.c | |
| parent | 621d983a1f9051f4cfc3f402569b46b77d8449fc (diff) | |
| download | qemu-10d01f73e39100701028c7badd6ece52990cf758.zip qemu-10d01f73e39100701028c7badd6ece52990cf758.tar.gz qemu-10d01f73e39100701028c7badd6ece52990cf758.tar.bz2 | |
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>
Diffstat (limited to 'hw/pci-host/q35.c')
| -rw-r--r-- | hw/pci-host/q35.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 8d060a5..eb1b2f7 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -447,14 +447,6 @@ static void mch_reset(DeviceState *qdev) 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) { int i; @@ -513,10 +505,6 @@ static void mch_realize(PCIDevice *d, Error **errp) mch->pci_address_space, &mch->pam_regions[i+1], 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) |