[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] pc: add pc_init_pci_2_1() and pc_compat_2_1()
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 07/11] pc: add pc_init_pci_2_1() and pc_compat_2_1() |
Date: |
Fri, 31 Oct 2014 16:38:38 +0000 |
it will be used later to disable incompatible
machine changes in 2.2.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/pc_piix.c | 13 ++++++++++++-
hw/i386/pc_q35.c | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 91a20cb..162b77e 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -302,8 +302,13 @@ static void pc_init_pci(MachineState *machine)
pc_init1(machine, 1, 1);
}
+static void pc_compat_2_1(MachineState *machine)
+{
+}
+
static void pc_compat_2_0(MachineState *machine)
{
+ pc_compat_2_1(machine);
/* This value depends on the actual DSDT and SSDT compiled into
* the source QEMU; unfortunately it depends on the binary and
* not on the machine type, so we cannot make pc-i440fx-1.7 work on
@@ -368,6 +373,12 @@ static void pc_compat_1_2(MachineState *machine)
x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
}
+static void pc_init_pci_2_1(MachineState *machine)
+{
+ pc_compat_2_1(machine);
+ pc_init_pci(machine);
+}
+
static void pc_init_pci_2_0(MachineState *machine)
{
pc_compat_2_0(machine);
@@ -471,7 +482,7 @@ static QEMUMachine pc_i440fx_machine_v2_2 = {
static QEMUMachine pc_i440fx_machine_v2_1 = {
PC_I440FX_2_1_MACHINE_OPTIONS,
.name = "pc-i440fx-2.1",
- .init = pc_init_pci,
+ .init = pc_init_pci_2_1,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_2_1,
{ /* end of list */ }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index e225c6d..0490980 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -280,8 +280,13 @@ static void pc_q35_init(MachineState *machine)
}
}
+static void pc_compat_2_1(MachineState *machine)
+{
+}
+
static void pc_compat_2_0(MachineState *machine)
{
+ pc_compat_2_1(machine);
smbios_legacy_mode = true;
has_reserved_memory = false;
pc_set_legacy_acpi_data_size();
@@ -315,6 +320,12 @@ static void pc_compat_1_4(MachineState *machine)
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0,
CPUID_EXT_PCLMULQDQ);
}
+static void pc_q35_init_2_1(MachineState *machine)
+{
+ pc_compat_2_1(machine);
+ pc_q35_init(machine);
+}
+
static void pc_q35_init_2_0(MachineState *machine)
{
pc_compat_2_0(machine);
@@ -367,7 +378,7 @@ static QEMUMachine pc_q35_machine_v2_2 = {
static QEMUMachine pc_q35_machine_v2_1 = {
PC_Q35_2_1_MACHINE_OPTIONS,
.name = "pc-q35-2.1",
- .init = pc_q35_init,
+ .init = pc_q35_init_2_1,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_2_1,
{ /* end of list */ }
--
1.8.3.1
- [Qemu-devel] [PATCH 00/11] pc: kvm: memory hotplug fixes, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 01/11] pc: kvm: check if KVM has free memory slots to avoid abort(), Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 02/11] kvm: provide API to query amount of memory slots supported by KVM, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 03/11] pc: check if KVM has enough memory slots for DIMM devices, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 04/11] pc: make pc_dimm_plug() more readble, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 05/11] pc: limit DIMM address and size to page aligned values, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 06/11] memory: expose alignment used for allocating RAM as MemoryRegion API, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 08/11] pc: align DIMM's address/size by backend's alignment value, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 07/11] pc: add pc_init_pci_2_1() and pc_compat_2_1(),
Igor Mammedov <=
- [Qemu-devel] [PATCH 09/11] pc: pc-dimm: use backend alignment during address auto allocation, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 10/11] pc: explicitly check maxmem limit when adding DIMM, Igor Mammedov, 2014/10/31
- [Qemu-devel] [PATCH 11/11] pc: count in 1Gb hugepage alignment when sizing hotplug-memory container, Igor Mammedov, 2014/10/31