{"id":810057,"url":"http://patchwork.ozlabs.org/api/patches/810057/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504603805-180240-2-git-send-email-arei.gonglei@huawei.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":"<1504603805-180240-2-git-send-email-arei.gonglei@huawei.com>","list_archive_url":null,"date":"2017-09-05T09:30:04","name":"[1/2] pc: add 2.11 machine type","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"01d268577222f231fe6f276f94b7dc60e5815022","submitter":{"id":35948,"url":"http://patchwork.ozlabs.org/api/people/35948/?format=json","name":"Gonglei","email":"arei.gonglei@huawei.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504603805-180240-2-git-send-email-arei.gonglei@huawei.com/mbox/","series":[{"id":1536,"url":"http://patchwork.ozlabs.org/api/series/1536/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1536","date":"2017-09-05T09:30:04","name":"Support over 64 vcpus for windows guests","version":1,"mbox":"http://patchwork.ozlabs.org/series/1536/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810057/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810057/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=)","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 3xmhT60lL0z9s1h\n\tfor ;\n\tTue, 5 Sep 2017 19:37:30 +1000 (AEST)","from localhost ([::1]:57733 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpAIS-0005BN-4S\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 05:37:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46358)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpABp-0008T5-OV\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:30:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpABk-0007uz-OY\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:30:37 -0400","from szxga05-in.huawei.com ([45.249.212.191]:2251)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71)\n\t(envelope-from ) id 1dpABk-0007sz-4r\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 05:30:32 -0400","from 172.30.72.60 (EHLO DGGEMS414-HUB.china.huawei.com)\n\t([172.30.72.60])\n\tby dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued)\n\twith ESMTP id DGQ09083; Tue, 05 Sep 2017 17:30:24 +0800 (CST)","from localhost (10.177.18.62) by DGGEMS414-HUB.china.huawei.com\n\t(10.3.19.214) with Microsoft SMTP Server id 14.3.301.0;\n\tTue, 5 Sep 2017 17:30:13 +0800"],"From":"Gonglei ","To":"","Date":"Tue, 5 Sep 2017 17:30:04 +0800","Message-ID":"<1504603805-180240-2-git-send-email-arei.gonglei@huawei.com>","X-Mailer":"git-send-email 2.8.2.windows.1","In-Reply-To":"<1504603805-180240-1-git-send-email-arei.gonglei@huawei.com>","References":"<1504603805-180240-1-git-send-email-arei.gonglei@huawei.com>","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.177.18.62]","X-CFilter-Loop":"Reflected","X-Mirapoint-Virus-RAPID-Raw":"score=unknown(0),\n\trefid=str=0001.0A0B0204.59AE6EB0.01F6, ss=1, re=0.000, recu=0.000,\n\treip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0,\n\tso=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32","X-Mirapoint-Loop-Id":"957929774d3f9df61be49d3b077bc4f5","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic]\n\t[fuzzy]","X-Received-From":"45.249.212.191","Subject":"[Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type","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":"weidong.huang@huawei.com, ehabkost@redhat.com, mst@redhat.com,\n\tmtosatti@redhat.com, Gonglei ,\n\tvrozenfe@redhat.com, pbonzini@redhat.com, rth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"CC: \"Michael S. Tsirkin\" \nCC: Paolo Bonzini \nCC: Richard Henderson \nCC: Eduardo Habkost \nSigned-off-by: Gonglei \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 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..d6fef8d 100644\n--- a/hw/i386/pc_q35.c\n+++ b/hw/i386/pc_q35.c\n@@ -302,20 +302,29 @@ 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 m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;\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+}\n+\n DEFINE_Q35_MACHINE(v2_10, \"pc-q35-2.10\", NULL,\n pc_q35_2_10_machine_options);\n \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 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 {\\\n","prefixes":["1/2"]}