{"id":810641,"url":"http://patchwork.ozlabs.org/api/patches/810641/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906142658.58298-2-marcel@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":"<20170906142658.58298-2-marcel@redhat.com>","list_archive_url":null,"date":"2017-09-06T14:26:57","name":"[1/2] pc: add 2.11 machine types","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"19176aa2d87c3b3403524035e93e4d7e79f45df1","submitter":{"id":65362,"url":"http://patchwork.ozlabs.org/api/people/65362/?format=json","name":"Marcel Apfelbaum","email":"marcel@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906142658.58298-2-marcel@redhat.com/mbox/","series":[{"id":1825,"url":"http://patchwork.ozlabs.org/api/series/1825/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1825","date":"2017-09-06T14:26:57","name":"hw/pcie: disable IO port fwd by default for pcie-root-port.","version":1,"mbox":"http://patchwork.ozlabs.org/series/1825/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810641/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810641/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcel@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 3xnQtl6DS7z9t50\n\tfor ;\n\tThu, 7 Sep 2017 00:28:47 +1000 (AEST)","from localhost ([::1]:36412 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpbJt-0000UI-Ve\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 10:28:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60272)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpbId-0008O9-7y\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:27:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpbIV-0004k7-IB\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:27:27 -0400","from mx1.redhat.com ([209.132.183.28]:60368)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpbIV-0004js-A3\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:27:19 -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 660544E34A;\n\tWed, 6 Sep 2017 14:27:18 +0000 (UTC)","from localhost.localdomain (unknown [10.35.206.58])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2149A18684;\n\tWed, 6 Sep 2017 14:27:13 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 660544E34A","From":"Marcel Apfelbaum ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 17:26:57 +0300","Message-Id":"<20170906142658.58298-2-marcel@redhat.com>","In-Reply-To":"<20170906142658.58298-1-marcel@redhat.com>","References":"<20170906142658.58298-1-marcel@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.38]);\n\tWed, 06 Sep 2017 14:27:18 +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 1/2] pc: add 2.11 machine types","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":"marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net,\n\tehabkost@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Marcel Apfelbaum \n---\n hw/i386/pc_piix.c | 15 ++++++++++++---\n hw/i386/pc_q35.c | 13 +++++++++++--\n include/hw/i386/pc.h | 3 +++\n 3 files changed, 26 insertions(+), 5 deletions(-)","diff":"diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\nindex 46dfd2c954..b03cc047c3 100644\n--- a/hw/i386/pc_piix.c\n+++ b/hw/i386/pc_piix.c\n@@ -436,21 +436,30 @@ static void pc_i440fx_machine_options(MachineClass *m)\n m->default_display = \"std\";\n }\n \n-static void pc_i440fx_2_10_machine_options(MachineClass *m)\n+static void pc_i440fx_2_11_machine_options(MachineClass *m)\n {\n pc_i440fx_machine_options(m);\n m->alias = \"pc\";\n m->is_default = 1;\n }\n \n+DEFINE_I440FX_MACHINE(v2_11, \"pc-i440fx-2.11\", NULL,\n+ pc_i440fx_2_11_machine_options);\n+\n+static void pc_i440fx_2_10_machine_options(MachineClass *m)\n+{\n+ pc_i440fx_2_11_machine_options(m);\n+ m->is_default = 0;\n+ m->alias = NULL;\n+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n+}\n+\n DEFINE_I440FX_MACHINE(v2_10, \"pc-i440fx-2.10\", NULL,\n pc_i440fx_2_10_machine_options);\n \n static void pc_i440fx_2_9_machine_options(MachineClass *m)\n {\n pc_i440fx_2_10_machine_options(m);\n- m->is_default = 0;\n- m->alias = NULL;\n SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n }\ndiff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c\nindex 169a214d50..c1cba584d1 100644\n--- a/hw/i386/pc_q35.c\n+++ b/hw/i386/pc_q35.c\n@@ -302,10 +302,20 @@ static void pc_q35_machine_options(MachineClass *m)\n m->max_cpus = 288;\n }\n \n-static void pc_q35_2_10_machine_options(MachineClass *m)\n+static void pc_q35_2_11_machine_options(MachineClass *m)\n {\n pc_q35_machine_options(m);\n m->alias = \"q35\";\n+}\n+\n+DEFINE_Q35_MACHINE(v2_11, \"pc-q35-2.11\", NULL,\n+ pc_q35_2_11_machine_options);\n+\n+static void pc_q35_2_10_machine_options(MachineClass *m)\n+{\n+ pc_q35_2_11_machine_options(m);\n+ m->alias = NULL;\n+ SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);\n m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\n }\n \n@@ -315,7 +325,6 @@ DEFINE_Q35_MACHINE(v2_10, \"pc-q35-2.10\", NULL,\n static void pc_q35_2_9_machine_options(MachineClass *m)\n {\n pc_q35_2_10_machine_options(m);\n- m->alias = NULL;\n SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);\n }\n \ndiff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex d80859bfad..8226904524 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);\n int e820_get_num_entries(void);\n bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);\n \n+#define PC_COMPAT_2_10 \\\n+ HW_COMPAT_2_10 \\\n+\n #define PC_COMPAT_2_9 \\\n HW_COMPAT_2_9 \\\n {\\\n","prefixes":["1/2"]}