{"id":811629,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811629/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-3-git-send-email-mst@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504880304-12069-3-git-send-email-mst@redhat.com>","list_archive_url":null,"date":"2017-09-08T14:19:03","name":"[PULL,02/17] pc: add 2.11 machine types","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5e47008172ab4336768c32a23146bbb6f6b7fbd1","submitter":{"id":2235,"url":"http://patchwork.ozlabs.org/api/1.2/people/2235/?format=json","name":"Michael S. Tsirkin","email":"mst@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-3-git-send-email-mst@redhat.com/mbox/","series":[{"id":2227,"url":"http://patchwork.ozlabs.org/api/1.2/series/2227/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2227","date":"2017-09-08T14:18:52","name":"[PULL,01/17] vhost: Release memory references on cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/2227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811629/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811629/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mst@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 3xpfjn2sHHz9sBd\n\tfor ;\n\tSat, 9 Sep 2017 00:25:17 +1000 (AEST)","from localhost ([::1]:45692 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqKDb-0003Br-At\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:25:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48999)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqK7m-0006Yr-8W\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqK7g-0004om-Fo\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:14 -0400","from mx1.redhat.com ([209.132.183.28]:33992)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqK7g-0004nh-6F\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:08 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 4A2DC7F756;\n\tFri, 8 Sep 2017 14:19:07 +0000 (UTC)","from redhat.com (ovpn-120-144.rdu2.redhat.com [10.10.120.144])\n\tby smtp.corp.redhat.com (Postfix) with SMTP id 7605F60C14;\n\tFri, 8 Sep 2017 14:19:03 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4A2DC7F756","Date":"Fri, 8 Sep 2017 17:19:03 +0300","From":"\"Michael S. Tsirkin\" ","To":"qemu-devel@nongnu.org","Message-ID":"<1504880304-12069-3-git-send-email-mst@redhat.com>","References":"<1504880304-12069-1-git-send-email-mst@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<1504880304-12069-1-git-send-email-mst@redhat.com>","X-Mutt-Fcc":"=sent","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tFri, 08 Sep 2017 14:19:07 +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] [PULL 02/17] 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 Apfelbaum ,\n\tPeter Maydell ,\n\tRichard Henderson ,\n\tEduardo Habkost , \n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marcel Apfelbaum \n\nSigned-off-by: Marcel Apfelbaum \nReviewed-by: Michael S. Tsirkin \nSigned-off-by: Michael S. Tsirkin \n---\n include/hw/i386/pc.h | 3 +++\n hw/i386/pc_piix.c | 15 ++++++++++++---\n hw/i386/pc_q35.c | 13 +++++++++++--\n 3 files changed, 26 insertions(+), 5 deletions(-)","diff":"diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex d80859b..8226904 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 {\\\ndiff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\nindex 46dfd2c..b03cc04 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 169a214..c1cba58 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 \n","prefixes":["PULL","02/17"]}