From patchwork Fri Jan 20 14:11:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Dennis-Jordan X-Patchwork-Id: 9528559 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 9356460434 for ; Fri, 20 Jan 2017 14:12:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82CF728684 for ; Fri, 20 Jan 2017 14:12:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 777EE2868C; Fri, 20 Jan 2017 14:12:31 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 F38BB28684 for ; Fri, 20 Jan 2017 14:12:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752351AbdATOMX (ORCPT ); Fri, 20 Jan 2017 09:12:23 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33099 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752332AbdATOMV (ORCPT ); Fri, 20 Jan 2017 09:12:21 -0500 Received: by mail-wm0-f67.google.com with SMTP id r144so7035680wme.0 for ; Fri, 20 Jan 2017 06:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philjordan-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FYo47NoGyMXEwAZcg1ZyHY3W12fCoCdErvryHQO8bpA=; b=n3j8+EKL2SRMxsa4TB1YPUQDdHGdK1U3H9EEf29wmGEr43Z6U9ARJWcVRUhl0L8GU6 K715FkbIE0tPM97Qg4AL/649do7QTUMJ4CteoRz97hqKUsZDgUkmOSo1lPvyE75hq/rz wZ7x2PTZwh4pKZ5s0Hp/Nxv65u9Df0ny6Fi8MQ1arlAZDW/ljq3d645JsJktYGrbg1YP r6DThST4xzdN7ZzyQ+svrjWOLPqiJG/a7ult7A2pyGvcFMUU4yYPJMgEcStazwIv9iUp EzQ6YZpb9a4S1q0RNH8zC3B4Fdajpsl4E9/w9ta0tSPjtOV/DFoOEPlcSEnpKpG44Lsa L3Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FYo47NoGyMXEwAZcg1ZyHY3W12fCoCdErvryHQO8bpA=; b=Sy4cBtNpbKNbk7P7NQ/9k5wegyqoRHkCIpWnRXeiOB+rDVngR+I3+hJa6m69Xjq0Zk ayXbWdPbz3+vyldme20E1SRKiiLX8cn+XW6r1YMRsl22BkIsQl/p+3vquJ/t5QOHy+Xd FaY9GGrwoSbUbTxQSq+0VPT8TAElSV54jQhsvqt+cPyTE9QWpwYFuu5+sZZM4QjAaFbc 7Aj/1PB1h6elixT6YMPwcfPck54xslBY+8BjN5H+vsgoflIKnlVbwCYf2QXeuorxwREJ RfemnsprkBFW2SRb1Ji7dsYuHYq9Xxa5VjPu7+Y9FcGsOoIzUHltCiU0h9s0XS9BDZMn OfBw== X-Gm-Message-State: AIkVDXLcg/RL6esnoperdzwM6Y9SZc/kG3eUG95mL0HeSDXjccplff6x3FpzWn0VHc2tGg== X-Received: by 10.223.162.153 with SMTP id s25mr7822525wra.148.1484921535399; Fri, 20 Jan 2017 06:12:15 -0800 (PST) Received: from Phils-MacBook-Pro-57025.local.eu (37-186-10-86.ip.as39912.net. [37.186.10.86]) by smtp.gmail.com with ESMTPSA id 191sm6339827wmo.21.2017.01.20.06.12.14 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 Jan 2017 06:12:14 -0800 (PST) From: Phil Dennis-Jordan To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcelo Tosatti , "Michael S. Tsirkin" , kvm@vger.kernel.org, Phil Dennis-Jordan Subject: [PATCH v2 2/3] pc: Add 2.9 machine type Date: Fri, 20 Jan 2017 15:11:35 +0100 Message-Id: <1484921496-11257-3-git-send-email-phil@philjordan.eu> X-Mailer: git-send-email 2.3.2 (Apple Git-55) In-Reply-To: <1484921496-11257-1-git-send-email-phil@philjordan.eu> References: <1484921496-11257-1-git-send-email-phil@philjordan.eu> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Phil Dennis-Jordan --- hw/i386/pc_piix.c | 13 ++++++++++++- hw/i386/pc_q35.c | 12 +++++++++++- include/hw/i386/pc.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5e1adbe..cdbe396 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -437,13 +437,24 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display = "std"; } -static void pc_i440fx_2_8_machine_options(MachineClass *m) +static void pc_i440fx_2_9_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; } +DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL, + pc_i440fx_2_9_machine_options); + +static void pc_i440fx_2_8_machine_options(MachineClass *m) +{ + pc_i440fx_2_9_machine_options(m); + m->is_default = 0; + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); +} + DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, pc_i440fx_2_8_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d042fe0..e4bdec5 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -301,12 +301,22 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_2_8_machine_options(MachineClass *m) +static void pc_q35_2_9_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } +DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL, + pc_q35_2_9_machine_options); + +static void pc_q35_2_8_machine_options(MachineClass *m) +{ + pc_q35_2_9_machine_options(m); + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); +} + DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, pc_q35_2_8_machine_options); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b22e699..853edf8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -375,6 +375,7 @@ int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_8 \ + HW_COMPAT_2_8 \ #define PC_COMPAT_2_7 \ HW_COMPAT_2_7 \