[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/38] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q3
From: |
Paolo Bonzini |
Subject: |
[PULL 03/38] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35 |
Date: |
Wed, 8 Jan 2020 13:32:20 +0100 |
From: Denis Plotnikov <address@hidden>
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 <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 721c7aa..fa12203 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -425,7 +425,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,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 52f4573..84cf925 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -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,
--
1.8.3.1
- [PULL 00/38] Misc patches for 2020-01-08, Paolo Bonzini, 2020/01/08
- [PULL 01/38] x86: Check for machine state object class before typecasting it, Paolo Bonzini, 2020/01/08
- [PULL 03/38] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35,
Paolo Bonzini <=
- [PULL 02/38] accel/kvm: Make "kernel_irqchip" default on, Paolo Bonzini, 2020/01/08
- [PULL 04/38] replay: check other timers for icount limit, Paolo Bonzini, 2020/01/08
- [PULL 05/38] replay: record and replay random number sources, Paolo Bonzini, 2020/01/08
- [PULL 06/38] hw/i386/x86-iommu: Add missing stubs, Paolo Bonzini, 2020/01/08
- [PULL 07/38] hw/i386/pc: fix regression in parsing vga cmdline parameter, Paolo Bonzini, 2020/01/08
- [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 09/38] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled, Paolo Bonzini, 2020/01/08
- [PULL 10/38] hw/intc/i8259: Fix Kconfig dependency on ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 11/38] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config, Paolo Bonzini, 2020/01/08
- [PULL 12/38] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms, Paolo Bonzini, 2020/01/08