[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() |
Date: |
Wed, 29 Nov 2017 16:23:00 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 29.11.2017 13:33, Mohammed Gamal wrote:
> Instead of having the same error checks in vtd_realize()
> and amdvi_realize(), move that over to the generic
> x86_iommu_realize().
>
> Reviewed-by: Peter Xu <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Mohammed Gamal <address@hidden>
> ---
> hw/i386/amd_iommu.c | 13 ++-----------
> hw/i386/intel_iommu.c | 13 ++-----------
> hw/i386/x86-iommu.c | 13 +++++++++++++
> 3 files changed, 17 insertions(+), 22 deletions(-)
>
> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
> index ad8155c..1618282 100644
> --- a/hw/i386/amd_iommu.c
> +++ b/hw/i386/amd_iommu.c
> @@ -1141,18 +1141,9 @@ static void amdvi_realize(DeviceState *dev, Error
> **err)
> AMDVIState *s = AMD_IOMMU_DEVICE(dev);
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
> MachineState *ms = MACHINE(qdev_get_machine());
> - MachineClass *mc = MACHINE_GET_CLASS(ms);
> - PCMachineState *pcms =
> - PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> - PCIBus *bus;
> -
> - if (!pcms) {
> - error_setg(err, "Machine-type '%s' not supported by amd-iommu",
> - mc->name);
> - return;
> - }
> + PCMachineState *pcms = PC_MACHINE(ms);
> + PCIBus *bus = pcms->bus;
>
> - bus = pcms->bus;
> s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
> amdvi_uint64_equal, g_free, g_free);
>
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index 3a5bb0b..0138b3b 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -3027,20 +3027,11 @@ static bool vtd_decide_config(IntelIOMMUState *s,
> Error **errp)
> static void vtd_realize(DeviceState *dev, Error **errp)
> {
> MachineState *ms = MACHINE(qdev_get_machine());
> - MachineClass *mc = MACHINE_GET_CLASS(ms);
> - PCMachineState *pcms =
> - PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> - PCIBus *bus;
> + PCMachineState *pcms = PC_MACHINE(ms);
> + PCIBus *bus = pcms->bus;
> IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
>
> - if (!pcms) {
> - error_setg(errp, "Machine-type '%s' not supported by intel-iommu",
> - mc->name);
> - return;
> - }
> -
> - bus = pcms->bus;
> x86_iommu->type = TYPE_INTEL;
>
> if (!vtd_decide_config(s, errp)) {
> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
> index 293caf8..51de519 100644
> --- a/hw/i386/x86-iommu.c
> +++ b/hw/i386/x86-iommu.c
> @@ -21,6 +21,8 @@
> #include "hw/sysbus.h"
> #include "hw/boards.h"
> #include "hw/i386/x86-iommu.h"
> +#include "hw/i386/pc.h"
> +#include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "trace.h"
>
> @@ -80,7 +82,18 @@ static void x86_iommu_realize(DeviceState *dev, Error
> **errp)
> {
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
> X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);
> + MachineState *ms = MACHINE(qdev_get_machine());
> + MachineClass *mc = MACHINE_GET_CLASS(ms);
> + PCMachineState *pcms =
> + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> QLIST_INIT(&x86_iommu->iec_notifiers);
> +
> + if (!pcms) {
> + error_setg(errp, "Machine-type '%s' not supported by IOMMU",
> + mc->name);
> + return;
> + }
> +
> if (x86_class->realize) {
> x86_class->realize(dev, errp);
> }
>
Reviewed-by: Thomas Huth <address@hidden>