From patchwork Mon May 14 16:41:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 10398889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7BE9860536 for ; Mon, 14 May 2018 16:42:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D80B28390 for ; Mon, 14 May 2018 16:42:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 619B4283AD; Mon, 14 May 2018 16:42:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B30B628390 for ; Mon, 14 May 2018 16:42:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932255AbeENQmU (ORCPT ); Mon, 14 May 2018 12:42:20 -0400 Received: from mail-cys01nam02on0080.outbound.protection.outlook.com ([104.47.37.80]:44837 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932214AbeENQmR (ORCPT ); Mon, 14 May 2018 12:42:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=K/wl46KaQm28RxM6uC6G0JZMoaPxn92huKw1rwWXZPk=; b=FmlcdmDlw2WKpMQX9/OaPGkCwL3QYEvZiNWrnMyMBnCStKQfY+7Tw2tfRL720ykdZg+JsBeHlvReXVuMJ3UHr9p0Sgi0kIaCcKejVobT2C7LgiguexFZCDEitEoW2rTfilaFAdPx3luvzVRW+2MhfLMuI1hZ2IhdXWLPGimTlB8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from bmoger-ubuntu.amd.com (165.204.78.1) by MW2PR12MB2476.namprd12.prod.outlook.com (2603:10b6:907:9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 16:42:12 +0000 From: Babu Moger To: mst@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, geoff@hostfission.com, kash@tripleback.net, babu.moger@amd.com Subject: [PATCH v9 1/7] pc: add 2.13 machine types Date: Mon, 14 May 2018 11:41:50 -0500 Message-Id: <20180514164156.27034-2-babu.moger@amd.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514164156.27034-1-babu.moger@amd.com> References: <20180514164156.27034-1-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0701CA0008.namprd07.prod.outlook.com (2603:10b6:803:28::18) To MW2PR12MB2476.namprd12.prod.outlook.com (2603:10b6:907:9::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MW2PR12MB2476; X-Microsoft-Exchange-Diagnostics: 1; MW2PR12MB2476; 3:x2wNR1fmL0ZPSNTI8ZaCRqlXj7d9zZZimH4MNFDZpN88JnRs4z3KpEmbI6IGNrwpT0tGDHtiXNi79UV86v9eRd5RMT27bxBY+05Vtuyea5200WoUZ52S5tX3tEYMJie8NPECXe7T08CY8eWPbyt2XjytewfmQsrXM3WLlPZjCXuthcyueSoEep+eUGp2pgcktnDBHF8wiDsG8vvKwZfagQeg+bfPAB+1Z3UzFnEIly1qv1EJFtepFUSiebe5IWn3; 25:S1LbhkNXRVZQLQPa3WWOTipk6KRMS9i8I+de6qQfP6a8ZzW4UJQhNJd+iE7kAztmNCEjyT1jCwfhD3pdOeO8zF93E3gelCPohpv/EYwVS5VWSdNC5DYb9JZ996he3UfUGe+C42KVWLPzYTXc/VxVIHhOfZAlZV1DzbnlKFfCWxM4o5UY1FbBwqrWTVCENW8v9448FYe8PYfjvtVMCP9pakC4ek10DgbwAgWalD2ytQ0MyLoV6jMLa71JfSIy+l13FDWGZSQ48+u0076DNjbkxCJSqhSPEr6moF8Mtfj4xVDLXIlMMXlOvTFzolungmqDAgTm2rNKVg+vV0iDT95xfA==; 31:vt6yvwvJ5Hxewy81v5HLNXBgUbtX9317q6pMnCKDIjyMLa7CMYij5GlSG7A91JGEeTaCnu5SdTcXSMTe0rIWtcrthdfdi/pmFbf5DunQJOI05n/Qua4m0iBbaVZQ5vmCOo6nfiq1wEYpFQW/sWOB3iApSzzo3pq7LI1aEiKjS88DDeQLTltjdd216Sn8l8c0z+fwXAMKGfN/DZzVGXOs60FL5gTwHrOPCx9urs6PXBY= X-MS-TrafficTypeDiagnostic: MW2PR12MB2476: X-Microsoft-Exchange-Diagnostics: 1; MW2PR12MB2476; 20:FKTu02yHk1my+LXufVQtOFFDFh+QD5bPQrVYRXu+xOLYO392XR1AryiMhYUhdgU0zgN9LBKX/VJ/O0WxHGkShz8zoTzUcV6kmNAPCsJwZHcbiPXMsvsWy25j90X8Od0qGaC58rcHA0eG9bSIalRbq+wCjoyK8BF+yklKKjULLjv+GW7gBESdbe8142OBx/xooHkZdszM8TIvEh8L78U39uXFJxiJkdT4bxkqzIPrhkc7ITcZEfijt2okVhEsLDWeQBOvX47iGqYB9khElKRv46KNiMn8hqq43Zh4uSjzls3nomahrW2hxYcNPa606jdSkhWA5xqRSRIAe+y/aVI80dF+Ww4ICZ3Z+nnn1oZ2saFwVpW9BJLWy6b89KIAcNrs6bKb9uZB70aazSnAi7UL6TYYRQzBSnH338o9jaIisCSWZuvRphZN78LNcDHIVtctKS2U/cbOZT3/J9RriwJYkUVit5LdFPK8Q3u0sT0YuoMjTNfXb7s3G4KnPJzcYD7N; 4:Y7hjFB0I77em2aophjXVzeqna3XKpUPJwIoDWRpuqMKV7HPix+0UfUUvRdYBpB1els05Aw/EE9AGodltuX9gqHKKsf9vO9mqj+3JzyQsryuULjZp5BVXt5wqaFkNfLhdvG2h6PSVNPGeYtExniQIDXmAJq+kAEjv2yE3ZY2CSD4Jp3V8pseEKwE/6JXG4hJk/KZEaC1tIN0nf0lXigXVHavp4ZW5qvdy/uk3gkQV/tatpl07UkSVtYTK7ICYoUao/y+il+sedFrXiDNl3Pe/1q4GPjz53qjDsbPoRHKX2pXoLOHaxatKoBK7jiWt3moe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:MW2PR12MB2476; BCL:0; PCL:0; RULEID:; SRVR:MW2PR12MB2476; X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(396003)(346002)(376002)(366004)(199004)(189003)(50226002)(53936002)(50466002)(8936002)(8676002)(39060400002)(48376002)(2616005)(486006)(476003)(305945005)(25786009)(7736002)(6666003)(446003)(11346002)(956004)(5660300001)(76176011)(186003)(36756003)(86362001)(16526019)(81166006)(26005)(4326008)(386003)(81156014)(7416002)(106356001)(53416004)(72206003)(97736004)(316002)(47776003)(478600001)(105586002)(51416003)(68736007)(6116002)(3846002)(16586007)(2906002)(6486002)(1076002)(44832011)(7696005)(66066001)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR12MB2476; H:bmoger-ubuntu.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR12MB2476; 23:r8xm33QfFzBSutrEZPUrzufdRFpMnsz2von+sgaQi?= =?us-ascii?Q?eB31P7j1hk+czYMQe8exgpAlTDbe9sHrAqNjAv3Ho8fxDoIRUG9ZAxb3hLIt?= =?us-ascii?Q?3UwrwkhIZxGf95FKC28YKbPUI0IHqwKUJOgoFcNJf+UeO2Yk5RxGgekqTfgU?= =?us-ascii?Q?qFziRIHESIycGJLYwbyM3Km5RA/f9S1Yb3ol5EbuF1d/tSr5wSrLShXxfmal?= =?us-ascii?Q?nEWAU0R3HPUldcOcrkXNOhNHV8K5W/iFfN7AzQCnxYwXJXxdipckpMV4v6s3?= =?us-ascii?Q?0xQftWbF6/eFsFwJIPOEpXZXW5J4ue7kYZ0qwsWVIxdh0ckyjXoxYWhoua6N?= =?us-ascii?Q?46jpenAAbFUz9aQU/Vgjv4O7aPILSpmgsLB+1D2Tuwi5jeyaTy99Pua5FXp5?= =?us-ascii?Q?EBdZaeXbhVUpoo6Hohci/3SVtrbMUXcBrACMNfi78wchDjL0N27HoqBGB2DC?= =?us-ascii?Q?z4I2KqAwEv03/RTt1pOOjH2qByIGB0MTu4lX2PnUu5vNVzl1AjEcFFRhaPPJ?= =?us-ascii?Q?UfV6VDfKKipmaB5MYLi/fnikgjIDagnaGDniO/LKAYk1Ujs8rtmKbg7G0xx/?= =?us-ascii?Q?XtbPzoScGlzsYJ0nGF6DRZkQSyDRz3lqB9jgEWbb6FWNhcFwfwsaRkqzlNsT?= =?us-ascii?Q?6SEcwQv4rbpDnbcS9vJzqeOSIm9go9f9tQ/6Ttv28faL5IbLoRWA5GUW+ftT?= =?us-ascii?Q?OP6nGAPIcqbK5w7/AS8/864rt7i8vH1F2Jrk6Iex1KoVmUPX2OTMdrKIbJp7?= =?us-ascii?Q?II6LQhPIafNgMwCAlP514kiqTDj0UF1n3y4tYilEuEJlHdnUoKN8/sttitEo?= =?us-ascii?Q?5GGCXVTJP4DTZEHbcbKrL62FqhaWkcF3x1Oi1qoqpVCmv414Y3Sj8S6eahWs?= =?us-ascii?Q?l1THu/G2GrOJtj4Ao5wqPmFfDA+Qxwd+ZbbsH2YwifH/ajaF2VzdR/FTxtwe?= =?us-ascii?Q?EYqO1hPSI6DV8kvxVS24slxBCFzGuReufaErt1eYokcST6Y2lbcbV3XVPQrd?= =?us-ascii?Q?HgCBez2z2cQ2A/tVfChB+p9ZaXMx0tYWGV7MYJrKrUVuEYM3crZ9oeYIKRJb?= =?us-ascii?Q?rxwI2n03YXuY3xQ6p66+/BoRCNgeVXT26mLPw9Rr6tSXrFbG+WyknS3ihJol?= =?us-ascii?Q?Jdb7+VFFQ04KAKap8q72WJACEcC6d+ddaY9wj+GtTP5jMRyhFEHI9TgrpKnC?= =?us-ascii?Q?FsFVIWByK/W/YotsCDEza3sNiy/8wmlFD4AEHqHUGtTTsNWgIbAda/5S88Z0?= =?us-ascii?Q?7+8wJHa7CCz2aOQmjWKTN4L4XJmnJbCs7dM5weG?= X-Microsoft-Antispam-Message-Info: 6NtnhYxMVzkNOuCkEku9yl7lGMOGQ0oMYrI457hEp6yHwAypPCMwFkmrP1LViH2rrfL8T6HPMn59/XFmfBPDCICov4tCc6+H1VcxtMj72QNtwoHu5zDdjKXxz3vGcY75x3mFlgmCJRMSk+6E16xlvsh0MyMdC47TMwMu/16vLyA+O3lTGUiVVQeMQaApjzoQ X-Microsoft-Exchange-Diagnostics: 1; MW2PR12MB2476; 6:QuyCG+UF+Q5j4Q/Af+GZcEVT56T89uHPmH6ZztdXWx4r7DVxQs8HtzRLkQ6Bk3v3AgtEqWJIZixLFHpe986aSyrXhjNWT48IvHspOm2C60fSGGJGE/JjwDFtjd3znShTQnR08H6Ib0+6w8sz+BhtDfLqU2ewr1j/8/7ejBpPYhJCOb8+MS8s1mkPMkqHRcm0IzvSJYdkm2SO2WENIax98/JE4FOAz69T9+BNAeunPhYDzMWpMZiUVpRGpPJ4Q1XcSAF39iioBB76+U8KnLYkfWlwLdm58Kw7n4+tl1pDrwIMKxjqhX9a8SYnvnUUZgNFG3pGoesPHcr9DuwHk5mWJ+WP7WNNhoHB507EljB7xWT1ImYdezW7wao/YAZieucl/EhB5loTQNRYEameFfEsis6P7FwVfnLpGNCb3GoRg6WxEA+sbQ2tIuaHh1l3voIqnvTikh1VJQHEU1D0tPw0iw==; 5:MJJETH5EXeZsXhNVo+x59sdYnM2aM/+eGGNMMgV8wvWSGuoPV7lU/FcF5ku8E1Sm3kMrUKo7ihqB6IeC2vtl44EYXxpsDjpqnLRFxHI/kM1qhCvYOoMbkTeD5SHyCfU4IXM1uHj2TXsHB8eHI4gBHsjhO9uvw2t2YbYgqaf+Fgw=; 24:kXeiiAuvQCM5E2DGSO/HlP0Ax32Js3k4kl8GtDROrFGXsgKcn8aD/SkeEHxXtpCgYmZeGvUOjroPZU57xN1Ba7YmlNI1sb1k99LefdD6Bew= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR12MB2476; 7:1UQu2aw1BC71WKFFx9XJZSxFqtx6fTF/aCYO5foi05LE4az2n/fG570rtLqko6mP9FT1T0MI044aRdHr2ngcczy7DgPCuJ8X61X1eK1uSVeVzgJPTpW3BwV6HafezLBJfDlGBWqFThEjmt690vm0yxNw5L/tOLOmM8EygKdrA69xGQpLX/9Yn0uAq9LBhaiiotKBp0tquZMP2jUswsOz5I/nTX+kLjzB4XrGBRKg643Ym44SzG8eK6szaHvF2VEn; 20:sIyX/SwtULhSj4bnPm2FjYbkQqNIi2BdchsozIvhV2KUOj+XeO5DnxKEJnFd8Au2dowl4dq8YRWq3M0jeuFd3Ug5uFTK5GqranrWrR2bRuwVL4Qhai+5YNevtwfBYDgf8eydjrzVs6pmA44jrO3yuEOK7viiFXZ04NsjwI9sbWOeUgcD1KBVyEsPB2ENCXy/qhe7XTr0x/q2PdtkGhiew8MW0gfBpnSOfOZhWNwD6K6g7em/V9geYthdIbXLhV6g X-MS-Office365-Filtering-Correlation-Id: e0029fef-4b02-4a66-0509-08d5b9b9a58b X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 16:42:12.8045 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0029fef-4b02-4a66-0509-08d5b9b9a58b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2476 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add pc-q35-2.13 and pc-i440fx-2.13 machine types Signed-off-by: Babu Moger Reviewed-by: Eduardo Habkost --- hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 13 +++++++++++-- include/hw/i386/pc.h | 3 +++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 729a0508aa..e36c7bbb40 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -425,21 +425,30 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display = "std"; } -static void pc_i440fx_2_12_machine_options(MachineClass *m) +static void pc_i440fx_2_13_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; } +DEFINE_I440FX_MACHINE(v2_13, "pc-i440fx-2.13", NULL, + pc_i440fx_2_13_machine_options); + +static void pc_i440fx_2_12_machine_options(MachineClass *m) +{ + pc_i440fx_2_13_machine_options(m); + m->is_default = 0; + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); +} + DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL, pc_i440fx_2_12_machine_options); static void pc_i440fx_2_11_machine_options(MachineClass *m) { pc_i440fx_2_12_machine_options(m); - m->is_default = 0; - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_11); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9ae916327e..2372457c6a 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -308,12 +308,22 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_2_12_machine_options(MachineClass *m) +static void pc_q35_2_13_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } +DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL, + pc_q35_2_13_machine_options); + +static void pc_q35_2_12_machine_options(MachineClass *m) +{ + pc_q35_2_13_machine_options(m); + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); +} + DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL, pc_q35_2_12_machine_options); @@ -323,7 +333,6 @@ static void pc_q35_2_11_machine_options(MachineClass *m) pc_q35_2_12_machine_options(m); pcmc->default_nic_model = "e1000"; - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_11); } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 2e834e6ded..69fced9aea 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -304,6 +304,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +#define PC_COMPAT_2_12 \ + HW_COMPAT_2_12 \ + #define PC_COMPAT_2_11 \ HW_COMPAT_2_11 \ {\