pc-*-2.5 machine-types
v3 cover pc-*-2.5 machine-types
This introduces the pc-q35-2.5 and pc-i440fx-2.5 machine-types.
Changes v2 -> v3:
* Move broken_reserved_end=true to pc_*_2_4_machine_options()
* Fixed patch description on patch 2/3 (s/q35/piix/)
* Improved patch description on patch 3/3
Changes v1 -> v2:
* Trivial rebase on top of latest qemu.git master
Eduardo Habkost (3):
q35: Move options common to all classes to pc_q35_machine_options()
piix: Move options common to all classes to
pc_i440fx_machine_options()
pc: Introduce pc-*-2.5 machine classes
hw/i386/pc_piix.c | 22 +++++++++++++++++----- hw/i386/pc_q35.c | 22 ++++++++++++++++------ include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 40 insertions(+), 11 deletions(-)
Signature · 1 line
2.1.0
PATCH v3 1/3 q35: Move options common to all classes to pc_q35_machine_options()
The existing default_machine_opts, default_display, no_floppy, and no_tco settings will still apply to future machine classes. So it makes sense to move them to pc_q35_machine_options() instead of keeping them in a version-specific machine_options function.
--- hw/i386/pc_q35.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/i386/pc_q35.c +4 -4
@@ -364,6 +364,10 @@ static void pc_q35_machine_options(MachineClass *m) m->desc ="Standard PC (Q35 + ICH9, 2009)" ; m->hot_add_cpu = pc_hot_add_cpu; m->units_per_default_bus =1 ; + m->default_machine_opts ="firmware=bios-256k.bin" ; + m->default_display ="std" ; + m->no_floppy =1 ; + m->no_tco =0 ; }static void pc_q35_2_4_machine_options (MachineClass *m)
@@ -371,10 +375,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m); pcmc->broken_reserved_end = true; - m->default_machine_opts ="firmware=bios-256k.bin" ; - m->default_display ="std" ; - m->no_floppy =1 ; - m->no_tco =0 ; m->alias ="q35" ; }
Signature · 1 line
2.1.0
PATCH v3 2/3 piix: Move options common to all classes to pc_i440fx_machine_options()
In reply to Eduardo HabkostThe existing default_machine_opts and default_display settings will still apply to future machine classes. So it makes sense to move them to pc_i440fx_machine_options() instead of keeping them in a version-specific machine_options function.
--- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/i386/pc_piix.c +2 -2
@@ -460,6 +460,8 @@ static void pc_i440fx_machine_options(MachineClass *m) m->family ="pc_piix" ; m->desc ="Standard PC (i440FX + PIIX, 1996)" ; m->hot_add_cpu = pc_hot_add_cpu; + m->default_machine_opts ="firmware=bios-256k.bin" ; + m->default_display ="std" ; }static void pc_i440fx_2_4_machine_options (MachineClass *m)
@@ -467,8 +469,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m); pcmc->broken_reserved_end = true; - m->default_machine_opts ="firmware=bios-256k.bin" ; - m->default_display ="std" ; m->alias ="pc" ; m->is_default =1 ; }
Signature · 1 line
2.1.0
PATCH v3 3/3 pc: Introduce pc-*-2.5 machine classes
In reply to Eduardo HabkostIntroduce pc-*-2.5 machine classes, and add HW_COMPAT_2_4/PC_COMPAT_2_4 macros that will allow pc-*-2.4 compat properties to be added.
---
Changes v1 -> v2:
* Trivial rebase to qemu.git master
Changes v2 -> v3:
* Move broken_reserved_end=true to pc_*_2_4_machine_options()
* Improved commit message
--- hw/i386/pc_piix.c | 18 +++++++++++++++--- hw/i386/pc_q35.c | 14 ++++++++++++-- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 34 insertions(+), 5 deletions(-)
hw/i386/pc_piix.c +15 -3
@@ -464,15 +464,27 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display ="std" ; } -static void pc_i440fx_2_4_machine_options (MachineClass *m) +static void pc_i440fx_2_5_machine_options (MachineClass *m) { -PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m); - pcmc->broken_reserved_end = true; m->alias ="pc" ; m->is_default =1 ; } +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) +{ +PCMachineClass *pcmc =PC_MACHINE_CLASS (m); +pc_i440fx_2_5_machine_options (m); + m->alias =NULL ; + m->is_default =0 ; + pcmc->broken_reserved_end = true; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); +} +DEFINE_I440FX_MACHINE (v2_4,"pc-i440fx-2.4" ,NULL , pc_i440fx_2_4_machine_options)
hw/i386/pc_q35.c +12 -2
@@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco =0 ; } +static void pc_q35_2_5_machine_options (MachineClass *m) +{ +pc_q35_machine_options (m); + m->alias ="q35" ; +} + +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) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m); -pc_q35_machine_options (m); +pc_q35_2_5_machine_options (m); + m->alias =NULL ; pcmc->broken_reserved_end = true; - m->alias ="q35" ; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); } DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
include/hw/compat.h +3 -0
@@ -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",\
include/hw/i386/pc.h +4 -0
@@ -291,7 +291,11 @@ 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 \ + PC_COMPAT_2_4 \ HW_COMPAT_2_3 \ {\ .driver = TYPE_X86_CPU,\
Signature · 1 line
2.1.0
Re: [Qemu-devel] [PATCH v3 3/3] pc: Introduce pc-*-2.5 machine classes
Quoted 4 lines · On Mon, 14 Sep 2015 11:32:45 -0300 Eduardo Habkost <[email protected]> wrote:
Introduce pc-*-2.5 machine classes, and add HW_COMPAT_2_4/PC_COMPAT_2_4 macros that will allow pc-*-2.4 compat properties to be added.
Signed-off-by Eduardo Habkost <[email protected]>
Quoted 109 lines
---
Changes v1 -> v2:
* Trivial rebase to qemu.git masterChanges v2 -> v3:
* Move broken_reserved_end=true to pc_*_2_4_machine_options()Reported-by Igor Mammedov <[email protected]>* Improved commit message
--- hw/i386/pc_piix.c | 18 +++++++++++++++--- hw/i386/pc_q35.c | 14 ++++++++++++-- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 34 insertions(+), 5 deletions(-)hw/i386/pc_piix.c +15
-3@@ -464,15 +464,27 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display ="std" ; } -static void pc_i440fx_2_4_machine_options (MachineClass *m) +static void pc_i440fx_2_5_machine_options (MachineClass *m) { -PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_i440fx_machine_options (m); - pcmc->broken_reserved_end = true; m->alias ="pc" ; m->is_default =1 ; } +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) +{ +PCMachineClass *pcmc =PC_MACHINE_CLASS (m); +pc_i440fx_2_5_machine_options (m); + m->alias =NULL ; + m->is_default =0 ; + pcmc->broken_reserved_end = true; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); +} +DEFINE_I440FX_MACHINE (v2_4,"pc-i440fx-2.4" ,NULL , pc_i440fx_2_4_machine_options)hw/i386/pc_q35.c +12
-2@@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco =0 ; } +static void pc_q35_2_5_machine_options (MachineClass *m) +{ +pc_q35_machine_options (m); + m->alias ="q35" ; +} + +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) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m); -pc_q35_machine_options (m); +pc_q35_2_5_machine_options (m); + m->alias =NULL ; pcmc->broken_reserved_end = true; - m->alias ="q35" ; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); } DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,include/hw/compat.h +3
-0@@ -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",\include/hw/i386/pc.h +4
-0@@ -291,7 +291,11 @@ 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 \ + PC_COMPAT_2_4 \ HW_COMPAT_2_3 \ {\ .driver = TYPE_X86_CPU,\
Re: [Qemu-devel] [PATCH v3 3/3] pc: Introduce pc-*-2.5 machine classes
Quoted 9 lines · Igor Mammedov
Quoted 4 lines · On Mon, 14 Sep 2015 11:32:45 -0300 Eduardo Habkost <[email protected]> wrote:
Introduce pc-*-2.5 machine classes, and add HW_COMPAT_2_4/PC_COMPAT_2_4 macros that will allow pc-*-2.4 compat properties to be added.
Signed-off-by Eduardo Habkost <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
Thanks, I will include this in my new version of virtio-pci fixes.