Re: [Qemu-devel] [PATCH for-2.4] pc: fix machine options for pc-i440fx-2.3 and below

[Eduardo Habkost]

On Thu, Jul 09, 2015 at 03:28:22PM -0500, Michael Roth wrote:
> Commit fddd179 introduced a mechanical change that initialized default
> machine options using functions instead of macros. Prior to the change
> options for pc-i440fx-2.3 were defined as:
> 
>   #define PC_I440FX_MACHINE_OPTIONS \
>       PC_DEFAULT_MACHINE_OPTIONS, \
>       .family = "pc_piix", \
>       .desc = "Standard PC (i440FX + PIIX, 1996)", \
>       .hot_add_cpu = pc_hot_add_cpu
> 
>   #define PC_I440FX_2_4_MACHINE_OPTIONS                           \
>       PC_I440FX_MACHINE_OPTIONS,                                  \
>       .default_machine_opts = "firmware=bios-256k.bin",           \
>       .default_display = "std",                                   \
>       .alias = "pc",                                              \
>       .is_default = 1
> 
>   #define PC_I440FX_2_3_MACHINE_OPTIONS \
>       PC_I440FX_2_4_MACHINE_OPTIONS, \
>       .alias = NULL, \
>       .is_default = 0
> 
> However, as part of the conversion, the 2.3 definition was changed to
> inherit directly from PC_I440FX_MACHINE_OPTIONS instead of the 2.4
> options. As a result, the default pc bios for 2.3 and lower machines
> has changed to the 128K version, which breaks 2.3 <> 2.4 migration.
> 
> Fix this by restoring the original defaults. 2.4 machine options have
> not changed since the above commit, so no additional overrides are
> needed.
> 
> Cc: address@hidden
> Cc: address@hidden
> Signed-off-by: Michael Roth <address@hidden>

I submitted exactly the same fix on June 23:

  From: Eduardo Habkost <address@hidden>
  To: address@hidden, "Michael S. Tsirkin" <address@hidden>
  Date: Tue, 23 Jun 2015 14:00:51 -0300
  Message-Id: <address@hidden>
  Cc: Laszlo Ersek <address@hidden>,
          "Dr. David Alan Gilbert" <address@hidden>
  Subject: [Qemu-devel] [PATCH] pc: Fix resue of pc-i440fx-2.4 on pc-i440fx-2.3 
machine_options

-- 
Eduardo