pc: Set broken_reserved_end on pc-*-2.4, not 2.5
PATCH 1/1 pc: Set broken_reserved_end on pc-*-2.4, not 2.5
Version 1 of the pc-*-2.5 machine class series was applied to the PCI tree instead of v3 (which was rebased after the broken_reserved_end patch by Igor was included).
This patch includes the missing hunks from v3, to make sure broken_reserved_end is set at the right machine class.
--- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
hw/i386/pc_piix.c +2 -2
@@ -466,9 +466,7 @@ static void pc_i440fx_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 ; }
@@ -479,9 +477,11 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,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 ); }
hw/i386/pc_q35.c +2 -2
@@ -372,9 +372,7 @@ static void pc_q35_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); - pcmc->broken_reserved_end = true; m->alias ="q35" ; }
@@ -383,8 +381,10 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,static void pc_q35_2_4_machine_options (MachineClass *m) { +PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_2_5_machine_options (m); m->alias =NULL ; + pcmc->broken_reserved_end = true;SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); }
Signature · 1 line
2.1.0
Quoted 8 lines · On Wed, 23 Sep 2015 12:04:49 -0300 Eduardo Habkost <[email protected]> wrote:
Version 1 of the pc-*-2.5 machine class series was applied to the PCI tree instead of v3 (which was rebased after the
broken_reserved_endpatch by Igor was included).This patch includes the missing hunks from v3, to make sure
broken_reserved_endis set at the right machine class.Signed-off-by Eduardo Habkost <[email protected]>
Quoted 56 lines
--- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)hw/i386/pc_piix.c +2
-2@@ -466,9 +466,7 @@ static void pc_i440fx_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 ; }@@ -479,9 +477,11 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,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 ); }hw/i386/pc_q35.c +2
-2@@ -372,9 +372,7 @@ static void pc_q35_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); - pcmc->broken_reserved_end = true; m->alias ="q35" ; }@@ -383,8 +381,10 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,static void pc_q35_2_4_machine_options (MachineClass *m) { +PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_2_5_machine_options (m); m->alias =NULL ; + pcmc->broken_reserved_end = true;SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); }
Quoted 8 lines · Eduardo Habkost
Version 1 of the pc-*-2.5 machine class series was applied to the PCI tree instead of v3 (which was rebased after the
broken_reserved_endpatch by Igor was included).This patch includes the missing hunks from v3, to make sure
broken_reserved_endis set at the right machine class.Signed-off-by Eduardo Habkost <[email protected]>
Thanks!
I squashed this in.
Can you pls confirm I did this correctly this time?
Quoted 58 lines
--- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)hw/i386/pc_piix.c +2
-2@@ -466,9 +466,7 @@ static void pc_i440fx_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 ; }@@ -479,9 +477,11 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,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 ); }hw/i386/pc_q35.c +2
-2@@ -372,9 +372,7 @@ static void pc_q35_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); - pcmc->broken_reserved_end = true; m->alias ="q35" ; }@@ -383,8 +381,10 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,static void pc_q35_2_4_machine_options (MachineClass *m) { +PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_2_5_machine_options (m); m->alias =NULL ; + pcmc->broken_reserved_end = true;SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); }Signature · 1 line
2.1.0
Quoted 5 lines · On Thu, 24 Sep 2015 13:44:45 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 4 lines · Eduardo Habkost
Version 1 of the pc-*-2.5 machine class series was applied to the PCI tree instead of v3 (which was rebased after the
broken_reserved_endpatch by Igor was included).
Quoted 8 lines
Quoted 4 lines
This patch includes the missing hunks from v3, to make sure
broken_reserved_endis set at the right machine class.Signed-off-by Eduardo Habkost <[email protected]>Thanks!
I squashed this in.
Can you pls confirm I did this correctly this time?
it looks fine to me.
Quoted 60 lines
Quoted 59 lines
--- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)hw/i386/pc_piix.c +2
-2@@ -466,9 +466,7 @@ static void pc_i440fx_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 ; }@@ -479,9 +477,11 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,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 ); }hw/i386/pc_q35.c +2
-2@@ -372,9 +372,7 @@ static void pc_q35_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); - pcmc->broken_reserved_end = true; m->alias ="q35" ; }@@ -383,8 +381,10 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,static void pc_q35_2_4_machine_options (MachineClass *m) { +PCMachineClass *pcmc =PC_MACHINE_CLASS (m);pc_q35_2_5_machine_options (m); m->alias =NULL ; + pcmc->broken_reserved_end = true;SET_MACHINE_COMPAT (m,PC_COMPAT_2_4 ); }Signature · 1 line
2.1.0