pc-*-2.5 machine-types
v2 cover pc-*-2.5 machine-types
This introduces the pc-q35-2.5 and pc-i440fx-2.5 machine-types.
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()
q35: Move options common to all classes to pc_i440fx_machine_options()
pc: Introduce pc-*-2.5 machine classes
hw/i386/pc_piix.c | 18 +++++++++++++++--- hw/i386/pc_q35.c | 20 +++++++++++++++----- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 37 insertions(+), 8 deletions(-)
Signature · 1 line
2.1.0
PATCH v2 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
Re: [Qemu-devel] [PATCH v2 1/3] q35: Move options common to all classes to pc_q35_machine_options()
Quoted 6 lines · On Fri, 11 Sep 2015 17:14:23 -0300 Eduardo Habkost <[email protected]> wrote:
The existing
default_machine_opts,default_display,no_floppy, andno_tcosettings will still apply to future machine classes. So it makes sense to move them topc_q35_machine_options()instead of keeping them in a version-specificmachine_optionsfunction.Signed-off-by Eduardo Habkost <[email protected]>
Quoted 30 lines
--- 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" ; }
PATCH v2 2/3 q35: 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
Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options()
Quoted 4 lines · On Fri, 11 Sep 2015 17:14:24 -0300 Eduardo Habkost <[email protected]> wrote:
The existing
default_machine_optsanddefault_displaysettings will still apply to future machine classes. So it makes sense to move them topc_i440fx_machine_options()instead of keeping them in a version-specificmachine_optionsfunction.
s/q35/piix/ or something like this, with this:
Quoted 28 lines
Signed-off-by Eduardo Habkost <[email protected]>--- 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 ; }
Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options()
In reply to Eduardo HabkostQuoted 4 lines · On Fri, 11 Sep 2015 17:14:24 -0300 Eduardo Habkost <[email protected]> wrote:
The existing
default_machine_optsanddefault_displaysettings will still apply to future machine classes. So it makes sense to move them topc_i440fx_machine_options()instead of keeping them in a version-specificmachine_optionsfunction.
s/q35/piix/ or something like this, with this:
Quoted 28 lines
Signed-off-by Eduardo Habkost <[email protected]>--- 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 ; }
PATCH v2 3/3 pc: Introduce pc-*-2.5 machine classes
In reply to Eduardo Habkost--- hw/i386/pc_piix.c | 14 +++++++++++++- hw/i386/pc_q35.c | 12 +++++++++++- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 31 insertions(+), 2 deletions(-)
hw/i386/pc_piix.c +13 -1
@@ -464,7 +464,7 @@ 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);
@@ -473,6 +473,18 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) 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) +{ +pc_i440fx_2_5_machine_options (m); + m->alias =NULL ; + m->is_default =0 ; +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 +11 -1
@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco =0 ; } -static void pc_q35_2_4_machine_options (MachineClass *m) +static void pc_q35_2_5_machine_options (MachineClass *m) {PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);
@@ -378,6 +378,16 @@ static void pc_q35_2_4_machine_options(MachineClass *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) +{ +pc_q35_2_5_machine_options (m); + m->alias =NULL ; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); +} +DEFINE_Q35_MACHINE (v2_4,"pc-q35-2.4" ,NULL , pc_q35_2_4_machine_options);
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 v2 3/3] pc: Introduce pc-*-2.5 machine classes
Quoted 45 lines · On Fri, 11 Sep 2015 17:14:25 -0300 Eduardo Habkost <[email protected]> wrote:
Signed-off-by Eduardo Habkost <[email protected]>--- hw/i386/pc_piix.c | 14 +++++++++++++- hw/i386/pc_q35.c | 12 +++++++++++- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 31 insertions(+), 2 deletions(-)hw/i386/pc_piix.c +13
-1@@ -464,7 +464,7 @@ 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);@@ -473,6 +473,18 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) 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) +{ +pc_i440fx_2_5_machine_options (m); + m->alias =NULL ; + m->is_default =0 ; +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 +0
-0
hw/i386/pc_q35.c static void pc_q35_machine_options(MachineClass *m) · line 374
Quoted 6 lines
hw/i386/pc_q35.c +1
-1@@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco =0 ; } -static void pc_q35_2_4_machine_options (MachineClass *m) +static void pc_q35_2_5_machine_options (MachineClass *m) {
move
pcmc->broken_reserved_end = true
from 2.5 to 2.4 options, the same applies to piix case as well.
Quoted 49 lines
hw/i386/pc_q35.c +10
-0PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_machine_options (m);@@ -378,6 +378,16 @@ static void pc_q35_2_4_machine_options(MachineClass *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) +{ +pc_q35_2_5_machine_options (m); + m->alias =NULL ; +SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); +} +DEFINE_Q35_MACHINE (v2_4,"pc-q35-2.4" ,NULL , pc_q35_2_4_machine_options);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,\