From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUZvQ-0004MW-QX for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUZvM-00039o-RC for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:20 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33391) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUZvM-00038l-Ks for qemu-devel@nongnu.org; Fri, 20 Jan 2017 09:12:16 -0500 Received: by mail-wm0-x244.google.com with SMTP id r144so7035694wme.0 for ; Fri, 20 Jan 2017 06:12:16 -0800 (PST) From: Phil Dennis-Jordan Date: Fri, 20 Jan 2017 15:11:35 +0100 Message-Id: <1484921496-11257-3-git-send-email-phil@philjordan.eu> In-Reply-To: <1484921496-11257-1-git-send-email-phil@philjordan.eu> References: <1484921496-11257-1-git-send-email-phil@philjordan.eu> Subject: [Qemu-devel] [PATCH v2 2/3] pc: Add 2.9 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcelo Tosatti , "Michael S. Tsirkin" , kvm@vger.kernel.org, Phil Dennis-Jordan 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 \ -- 2.3.2 (Apple Git-55)