hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35
PATCH 1/1 hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35
5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase.
--- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-)
hw/i386/pc_piix.c +0 -1
@@ -431,7 +431,6 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) m->alias ="pc" ; m->is_default =1 ; pcmc->default_cpu_version =1 ; -compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,
hw/i386/pc_q35.c +0 -1
@@ -354,7 +354,6 @@ static void pc_q35_5_0_machine_options(MachineClass *m)pc_q35_machine_options (m); m->alias ="q35" ; pcmc->default_cpu_version =1 ; -compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,
Signature · 1 line
2.17.0
Quoted 6 lines · On Mon, 23 Dec 2019 10:28:56 +0300 Denis Plotnikov <[email protected]>…
5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase.
Signed-off-by Denis Plotnikov <[email protected]>
Quoted 29 lines
--- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-)hw/i386/pc_piix.c +0
-1@@ -431,7 +431,6 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) m->alias ="pc" ; m->is_default =1 ; pcmc->default_cpu_version =1 ; -compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,hw/i386/pc_q35.c +0
-1@@ -354,7 +354,6 @@ static void pc_q35_5_0_machine_options(MachineClass *m)pc_q35_machine_options (m); m->alias ="q35" ; pcmc->default_cpu_version =1 ; -compat_props_add (m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,
Quoted 4 lines · On Mon, 23 Dec 2019 10:28:56 +0300 Denis Plotnikov <[email protected]>…
5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase.
Yes, I seem to have fat-fingered that while rebasing.
Quoted 6 lines
Signed-off-by Denis Plotnikov <[email protected]>--- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-)
I double checked that the other compat machines seem fine.
Paolo Bonzini
AppliedQuoted 17 lines · Cornelia Huck
Quoted 4 lines · On Mon, 23 Dec 2019 10:28:56 +0300 Denis Plotnikov <[email protected]>…
5.0 machine type uses 4.2 compats. This seems to be incorrect, since the latests machine type by now is 5.0 and it should use its own compat or shouldn't use any relying on the defaults. Seems, like this appeared because of some problems on merge/rebase.
Yes, I seem to have fat-fingered that while rebasing.
Quoted 6 lines
Signed-off-by Denis Plotnikov <[email protected]>--- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-)
Quoted 4 lines
I double checked that the other compat machines seem fine.
Reviewed-by Cornelia Huck <[email protected]>
Queued, thanks.
Paolo