Re: [Qemu-devel] [PATCH] pc: Fix resue of pc-i440fx-2.4 on pc-i440fx-2.3 machine_options

["Dr. David Alan Gilbert" <dgilbert@redhat.com>]

* Eduardo Habkost (ehabkost@redhat.com) wrote:
> On commit fddd179ab962f6f78a8493742e1068d6a620e059, I broke the chaining of
> *_machine_options() functions on pc-i440fx-2.3, at:
> 
>   -#define PC_I440FX_2_3_MACHINE_OPTIONS \
>   -    PC_I440FX_2_4_MACHINE_OPTIONS, \
>   -    .alias = NULL, \
>   -    .is_default = 0
>   +static void pc_i440fx_2_3_machine_options(QEMUMachine *m)
>   +{
>   +    pc_i440fx_machine_options(m);
>   +    m->alias = NULL;
>   +    m->is_default = 0;
>   +}
> 
> I have replaced PC_I440FX_2_4_MACHINE_OPTIONS with a
> pc_i440fx_machine_options() call, instead of calling
> pc_i440fx_2_4_machine_options(). This broke the setting of default_machine_opts
> and default_display on pc-i440fx-{2.0,2,1,2.2,2.3}.
> 
> Fix this by making pc_i440fx_2_3_machine_options() reuse
> pc_i440fx_2_4_machine_options().
> 
> Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Thanks, that does solve that one.
(Unfortunately VGA memory size is still incompatible somewhere
between 2.1 and head by default; but I think that's separate).

Dave

> ---
>  hw/i386/pc_piix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index e142f75..b335856 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -486,7 +486,7 @@ DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
>  
>  static void pc_i440fx_2_3_machine_options(MachineClass *m)
>  {
> -    pc_i440fx_machine_options(m);
> +    pc_i440fx_2_4_machine_options(m);
>      m->alias = NULL;
>      m->is_default = 0;
>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_3);
> -- 
> 2.1.0
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK