[{"id":1769498,"web_url":"http://patchwork.ozlabs.org/comment/1769498/","msgid":"<20170915222727.GC10621@localhost.localdomain>","list_archive_url":null,"date":"2017-09-15T22:27:27","subject":"Re: [Qemu-devel] [PATCH v2 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","submitter":{"id":195,"url":"http://patchwork.ozlabs.org/api/people/195/","name":"Eduardo Habkost","email":"ehabkost@redhat.com"},"content":"On Fri, Sep 15, 2017 at 05:04:36PM +0200, Mohammed Gamal wrote:\n> Instead of having the same error checks in vtd_realize()\n> and amdvi_realize(), move that over to the generic\n> x86_iommu_realize().\n> \n> Signed-off-by: Mohammed Gamal \n> ---\n> hw/i386/amd_iommu.c | 10 +---------\n> hw/i386/intel_iommu.c | 10 +---------\n> hw/i386/x86-iommu.c | 13 +++++++++++++\n> 3 files changed, 15 insertions(+), 18 deletions(-)\n> \n> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c\n> index 334938a..839f01f 100644\n> --- a/hw/i386/amd_iommu.c\n> +++ b/hw/i386/amd_iommu.c\n> @@ -1141,18 +1141,10 @@ static void amdvi_realize(DeviceState *dev, Error **err)\n> AMDVIState *s = AMD_IOMMU_DEVICE(dev);\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> MachineState *ms = MACHINE(qdev_get_machine());\n> - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> PCMachineState *pcms =\n> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n\nThis function now expects pcms to never be NULL, so using\nobject_dynamic_cast() does not make sense. You can use\nPC_MACHINE(ms) directly.\n\n\n> - PCIBus *bus;\n> + PCIBus *bus = pcms->bus;\n> \n> - if (!pcms) {\n> - error_setg(err, \"Machine-type '%s' not supported by amd-iommu\",\n> - mc->name);\n> - return;\n> - }\n> -\n> - bus = pcms->bus;\n> s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,\n> amdvi_uint64_equal, g_free, g_free);\n> \n> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c\n> index 3a5bb0b..aa01812 100644\n> --- a/hw/i386/intel_iommu.c\n> +++ b/hw/i386/intel_iommu.c\n> @@ -3027,20 +3027,12 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)\n> static void vtd_realize(DeviceState *dev, Error **errp)\n> {\n> MachineState *ms = MACHINE(qdev_get_machine());\n> - MachineClass *mc = MACHINE_GET_CLASS(ms);\n> PCMachineState *pcms =\n> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n\nSame here.\n\n> - PCIBus *bus;\n> + PCIBus *bus = pcms->bus;\n> IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> \n> - if (!pcms) {\n> - error_setg(errp, \"Machine-type '%s' not supported by intel-iommu\",\n> - mc->name);\n> - return;\n> - }\n> -\n> - bus = pcms->bus;\n> x86_iommu->type = TYPE_INTEL;\n> \n> if (!vtd_decide_config(s, errp)) {\n> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\n> index 293caf8..51de519 100644\n> --- a/hw/i386/x86-iommu.c\n> +++ b/hw/i386/x86-iommu.c\n> @@ -21,6 +21,8 @@\n> #include \"hw/sysbus.h\"\n> #include \"hw/boards.h\"\n> #include \"hw/i386/x86-iommu.h\"\n> +#include \"hw/i386/pc.h\"\n> +#include \"qapi/error.h\"\n> #include \"qemu/error-report.h\"\n> #include \"trace.h\"\n> \n> @@ -80,7 +82,18 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)\n> {\n> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);\n> X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);\n> + MachineState *ms = MACHINE(qdev_get_machine());\n> + MachineClass *mc = MACHINE_GET_CLASS(ms);\n> + PCMachineState *pcms =\n> + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));\n> QLIST_INIT(&x86_iommu->iec_notifiers);\n> +\n> + if (!pcms) {\n> + error_setg(errp, \"Machine-type '%s' not supported by IOMMU\",\n> + mc->name);\n> + return;\n> + }\n> +\n> if (x86_class->realize) {\n> x86_class->realize(dev, errp);\n> }\n> -- \n> 1.8.3.1\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=ehabkost@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xv95g1ZM4z9s5L\n\tfor ;\n\tSat, 16 Sep 2017 08:28:04 +1000 (AEST)","from localhost ([::1]:55204 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsz5d-00079G-PL\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 18:28:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40226)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsz5I-000791-Fh\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 18:27:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsz5D-0002fE-Hu\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 18:27:40 -0400","from mx1.redhat.com ([209.132.183.28]:40808)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsz5D-0002ex-8X\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 18:27:35 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 32E13C014173\n\tfor ; Fri, 15 Sep 2017 22:27:34 +0000 (UTC)","from localhost (ovpn-116-24.gru2.redhat.com [10.97.116.24])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 496604F9B5;\n\tFri, 15 Sep 2017 22:27:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 32E13C014173","Date":"Fri, 15 Sep 2017 19:27:27 -0300","From":"Eduardo Habkost ","To":"Mohammed Gamal ","Message-ID":"<20170915222727.GC10621@localhost.localdomain>","References":"<1505487877-22799-1-git-send-email-mgamal@redhat.com>\n\t<1505487877-22799-2-git-send-email-mgamal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1505487877-22799-2-git-send-email-mgamal@redhat.com>","X-Fnord":"you can see the fnord","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 15 Sep 2017 22:27:34 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v2 1/2] x86_iommu: Move machine check to\n\tx86_iommu_realize()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org,\n\tpeterx@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]