From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSiGv-00035c-Qd for qemu-devel@nongnu.org; Fri, 21 Aug 2015 05:06:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSiGu-000287-NZ for qemu-devel@nongnu.org; Fri, 21 Aug 2015 05:06:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSiGu-00027q-Gh for qemu-devel@nongnu.org; Fri, 21 Aug 2015 05:06:00 -0400 From: Jason Wang Date: Fri, 21 Aug 2015 17:05:45 +0800 Message-Id: <1440147950-1178-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1440147950-1178-1-git-send-email-jasowang@redhat.com> References: <1440147950-1178-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] pc: introduce 2.5 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mst@redhat.com Cc: Paolo Bonzini , Jason Wang , Eduardo Habkost , Richard Henderson This will be used by virtio 1.0 virtio-pci virtqueue migration backward compatibility. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- hw/i386/pc_piix.c | 21 +++++++++++++++++++-- hw/i386/pc_q35.c | 23 +++++++++++++++++++++-- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 3 +++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a896624..2a7b7d9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -304,9 +304,15 @@ static void pc_init1(MachineState *machine) } } +static void pc_compat_2_4(MachineState *machine) +{ +} + static void pc_compat_2_3(MachineState *machine) { PCMachineState *pcms = PC_MACHINE(machine); + + pc_compat_2_4(machine); savevm_skip_section_footers(); if (kvm_enabled()) { pcms->smm = ON_OFF_AUTO_OFF; @@ -477,7 +483,7 @@ static void pc_i440fx_machine_options(MachineClass *m) m->hot_add_cpu = pc_hot_add_cpu; } -static void pc_i440fx_2_4_machine_options(MachineClass *m) +static void pc_i440fx_2_5_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->default_machine_opts = "firmware=bios-256k.bin"; @@ -486,7 +492,18 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) m->is_default = 1; } -DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, +DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, + pc_i440fx_2_5_machine_options) + +static void pc_i440fx_2_4_machine_options(MachineClass *m) +{ + pc_i440fx_machine_options(m); + m->default_machine_opts = "firmware=bios-256k.bin"; + m->default_display = "std"; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); +} + +DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", pc_compat_2_4, pc_i440fx_2_4_machine_options) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 974aead..88d3076 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -287,9 +287,15 @@ static void pc_q35_init(MachineState *machine) } } +static void pc_compat_2_4(MachineState *machine) +{ +} + static void pc_compat_2_3(MachineState *machine) { PCMachineState *pcms = PC_MACHINE(machine); + + pc_compat_2_4(machine); savevm_skip_section_footers(); if (kvm_enabled()) { pcms->smm = ON_OFF_AUTO_OFF; @@ -392,7 +398,7 @@ static void pc_q35_machine_options(MachineClass *m) m->units_per_default_bus = 1; } -static void pc_q35_2_4_machine_options(MachineClass *m) +static void pc_q35_2_5_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->default_machine_opts = "firmware=bios-256k.bin"; @@ -402,7 +408,20 @@ static void pc_q35_2_4_machine_options(MachineClass *m) m->alias = "q35"; } -DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, +DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, + pc_q35_2_5_machine_options); + +static void pc_q35_2_4_machine_options(MachineClass *m) +{ + pc_q35_machine_options(m); + m->default_machine_opts = "firmware=bios-256k.bin"; + m->default_display = "std"; + m->no_floppy = 1; + m->no_tco = 0; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); +} + +DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", pc_compat_2_4, pc_q35_2_4_machine_options); diff --git a/include/hw/compat.h b/include/hw/compat.h index 94c8097..095de5d 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_4 \ + /* empty */ + #define HW_COMPAT_2_3 \ {\ .driver = "virtio-blk-pci",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 954203d..156b4ef 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,6 +292,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_4 \ + HW_COMPAT_2_4 + #define PC_COMPAT_2_3 \ HW_COMPAT_2_3 \ {\ -- 2.1.4