{"id":815324,"url":"http://patchwork.ozlabs.org/api/patches/815324/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-12-git-send-email-eric.auger@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":"<1505807208-9063-12-git-send-email-eric.auger@redhat.com>","list_archive_url":null,"date":"2017-09-19T07:46:43","name":"[RFC,v4,11/16] hw/arm/virt: Add 2.11 machine type","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2cd485c47318b0be67735913ce890e78c1938961","submitter":{"id":69187,"url":"http://patchwork.ozlabs.org/api/people/69187/?format=json","name":"Eric Auger","email":"eric.auger@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-12-git-send-email-eric.auger@redhat.com/mbox/","series":[{"id":3796,"url":"http://patchwork.ozlabs.org/api/series/3796/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3796","date":"2017-09-19T07:46:32","name":"VIRTIO-IOMMU device","version":4,"mbox":"http://patchwork.ozlabs.org/series/3796/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815324/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815324/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eric.auger@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 3xxFXC6Pyrz9s7M\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 19 Sep 2017 17:54:51 +1000 (AEST)","from localhost ([::1]:40620 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1duDMn-0004nI-Lt\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 03:54:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48151)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eric.auger@redhat.com>) id 1duDHw-00019B-20\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:49:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eric.auger@redhat.com>) id 1duDHv-0001ZV-5M\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:49:48 -0400","from mx1.redhat.com ([209.132.183.28]:51422)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eric.auger@redhat.com>)\n\tid 1duDHp-0001WC-0S; Tue, 19 Sep 2017 03:49:41 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 E442E4FD;\n\tTue, 19 Sep 2017 07:49:39 +0000 (UTC)","from localhost.localdomain.com (ovpn-116-197.ams2.redhat.com\n\t[10.36.116.197])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 17C3C61342;\n\tTue, 19 Sep 2017 07:49:16 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E442E4FD","From":"Eric Auger <eric.auger@redhat.com>","To":"eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org,\n\talex.williamson@redhat.com, mst@redhat.com, qemu-arm@nongnu.org,\n\tqemu-devel@nongnu.org, jean-philippe.brucker@arm.com","Date":"Tue, 19 Sep 2017 09:46:43 +0200","Message-Id":"<1505807208-9063-12-git-send-email-eric.auger@redhat.com>","In-Reply-To":"<1505807208-9063-1-git-send-email-eric.auger@redhat.com>","References":"<1505807208-9063-1-git-send-email-eric.auger@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tTue, 19 Sep 2017 07:49:40 +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] [RFC v4 11/16] hw/arm/virt: Add 2.11 machine type","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"wei@redhat.com, kevin.tian@intel.com, marc.zyngier@arm.com,\n\ttn@semihalf.com, \n\twill.deacon@arm.com, drjones@redhat.com, peterx@redhat.com,\n\tlinuc.decode@gmail.com, bharat.bhushan@nxp.com,\n\tchristoffer.dall@linaro.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"The new machine type allows virtio-iommu instantiation.\n\nSigned-off-by: Eric Auger <eric.auger@redhat.com>\n\n---\n---\n hw/arm/virt.c         | 23 +++++++++++++++++++++--\n include/hw/arm/virt.h |  1 +\n 2 files changed, 22 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex cfd834d..9737a5f 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -1648,7 +1648,7 @@ static void machvirt_machine_init(void)\n }\n type_init(machvirt_machine_init);\n \n-static void virt_2_10_instance_init(Object *obj)\n+static void virt_2_11_instance_init(Object *obj)\n {\n     VirtMachineState *vms = VIRT_MACHINE(obj);\n     VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);\n@@ -1708,10 +1708,29 @@ static void virt_2_10_instance_init(Object *obj)\n     vms->irqmap = a15irqmap;\n }\n \n+static void virt_machine_2_11_options(MachineClass *mc)\n+{\n+}\n+DEFINE_VIRT_MACHINE_AS_LATEST(2, 11)\n+\n+#define VIRT_COMPAT_2_10 \\\n+    HW_COMPAT_2_10\n+\n+static void virt_2_10_instance_init(Object *obj)\n+{\n+    virt_2_11_instance_init(obj);\n+}\n+\n static void virt_machine_2_10_options(MachineClass *mc)\n {\n+    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));\n+\n+    virt_machine_2_11_options(mc);\n+    SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_10);\n+\n+    vmc->no_iommu = true;\n }\n-DEFINE_VIRT_MACHINE_AS_LATEST(2, 10)\n+DEFINE_VIRT_MACHINE(2, 10)\n \n #define VIRT_COMPAT_2_9 \\\n     HW_COMPAT_2_9\ndiff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h\nindex 33b0ff3..ff27551 100644\n--- a/include/hw/arm/virt.h\n+++ b/include/hw/arm/virt.h\n@@ -84,6 +84,7 @@ typedef struct {\n     bool disallow_affinity_adjustment;\n     bool no_its;\n     bool no_pmu;\n+    bool no_iommu;\n     bool claim_edge_triggered_timers;\n } VirtMachineClass;\n \n","prefixes":["RFC","v4","11/16"]}