[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] pc: Create pc_compat_2_1() functions
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 1/6] pc: Create pc_compat_2_1() functions |
Date: |
Tue, 4 Nov 2014 16:31:26 +0100 |
From: Eduardo Habkost <address@hidden>
We will need new compat code for the 2.1 machine-types.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <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 1cda5dd..9143374 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 4d9e3cd..bdb1a37 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -281,8 +281,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();
@@ -316,6 +321,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);
@@ -368,7 +379,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.4.5
- [Qemu-devel] [PULL 0/6] QOM CPUState patch queue 2014-11-04, Andreas Färber, 2014/11/04
- [Qemu-devel] [PULL 3/6] target-i386: Disable CPUID_ACPI by default in KVM mode, Andreas Färber, 2014/11/04
- [Qemu-devel] [PULL 4/6] target-i386: Remove unsupported bits from all CPU models, Andreas Färber, 2014/11/04
- [Qemu-devel] [PULL 1/6] pc: Create pc_compat_2_1() functions,
Andreas Färber <=
- [Qemu-devel] [PULL 5/6] target-i386: Don't enable nested VMX by default, Andreas Färber, 2014/11/04
- [Qemu-devel] [PULL 6/6] target-i386: Disable SVM by default in KVM mode, Andreas Färber, 2014/11/04
- [Qemu-devel] [PULL 2/6] target-i386: Rename KVM auto-feature-enable compat function, Andreas Färber, 2014/11/04