On Wed, Sep 23, 2015 at 12:04:49PM -0300, Eduardo Habkost 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_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.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Thanks!
I squashed this in.
Can you pls confirm I did this correctly this time?
> ---
> hw/i386/pc_piix.c | 4 ++--
> hw/i386/pc_q35.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index caa4edc..3ffb05f 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -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);
> }
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 506b6bf..1b7d3b6 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -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);
> }
>
> --
> 2.1.0
