{"id":814967,"url":"http://patchwork.ozlabs.org/api/patches/814967/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505745470-12208-2-git-send-email-mgamal@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505745470-12208-2-git-send-email-mgamal@redhat.com>","list_archive_url":null,"date":"2017-09-18T14:37:48","name":"[v4,1/3] x86_iommu: Move machine check to x86_iommu_realize()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5c9d0d36d64debbb4857abae923152ff6aa0ac88","submitter":{"id":72367,"url":"http://patchwork.ozlabs.org/api/people/72367/?format=json","name":"Mohammed Gamal","email":"mgamal@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505745470-12208-2-git-send-email-mgamal@redhat.com/mbox/","series":[{"id":3660,"url":"http://patchwork.ozlabs.org/api/series/3660/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3660","date":"2017-09-18T14:37:47","name":"x86_iommu: Fix segfault when starting on non-PCI machines","version":4,"mbox":"http://patchwork.ozlabs.org/series/3660/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814967/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814967/checks/","tags":{},"related":[],"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=mgamal@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 3xwpb626gJz9s7F\n\tfor ;\n\tTue, 19 Sep 2017 00:40:50 +1000 (AEST)","from localhost ([::1]:37032 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtxE8-0006Ay-C8\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 10:40:48 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55126)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtxBh-0004e8-JV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 10:38:23 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtxBd-00058L-IA\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 10:38:17 -0400","from mx1.redhat.com ([209.132.183.28]:55698)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtxBd-000586-9t\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 10:38:13 -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 5FA65C047B7D\n\tfor ; Mon, 18 Sep 2017 14:38:12 +0000 (UTC)","from mmorsy.remote.csb (unknown [10.40.205.53])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6CB9918506;\n\tMon, 18 Sep 2017 14:38:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 5FA65C047B7D","From":"Mohammed Gamal ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 16:37:48 +0200","Message-Id":"<1505745470-12208-2-git-send-email-mgamal@redhat.com>","In-Reply-To":"<1505745470-12208-1-git-send-email-mgamal@redhat.com>","References":"<1505745470-12208-1-git-send-email-mgamal@redhat.com>","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\tMon, 18 Sep 2017 14:38:12 +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":"[Qemu-devel] [PATCH v4 1/3] 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":"thuth@redhat.com, ehabkost@redhat.com, mst@redhat.com, peterx@redhat.com,\n\tpbonzini@redhat.com, Mohammed Gamal ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Instead of having the same error checks in vtd_realize()\nand amdvi_realize(), move that over to the generic\nx86_iommu_realize().\n\nSigned-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(-)","diff":"diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c\nindex 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- 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 \ndiff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c\nindex 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- 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)) {\ndiff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c\nindex 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","prefixes":["v4","1/3"]}