[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [QEMU v7 PATCH 6/7] PC: Add (empty) compat functions for ma
From: |
Gabriel L. Somlo |
Subject: |
[Qemu-devel] [QEMU v7 PATCH 6/7] PC: Add (empty) compat functions for machine version 2.0 |
Date: |
Mon, 21 Apr 2014 15:27:13 -0400 |
This patch contains no functional changes.
Signed-off-by: Gabriel Somlo <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 cca310b..3d3f4b7 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -262,8 +262,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
pc_init1(args, 1, 1);
}
+static void pc_compat_2_0(QEMUMachineInitArgs *args)
+{
+}
+
static void pc_compat_1_7(QEMUMachineInitArgs *args)
{
+ pc_compat_2_0(args);
smbios_defaults = false;
gigabyte_align = false;
option_rom_has_mr = true;
@@ -303,6 +308,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
}
+static void pc_init_pci_2_0(QEMUMachineInitArgs *args)
+{
+ pc_compat_2_0(args);
+ pc_init_pci(args);
+}
+
static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
{
pc_compat_1_7(args);
@@ -391,7 +402,7 @@ static QEMUMachine pc_i440fx_machine_v2_0 = {
PC_I440FX_2_0_MACHINE_OPTIONS,
.name = "pc-i440fx-2.0",
.alias = "pc",
- .init = pc_init_pci,
+ .init = pc_init_pci_2_0,
.is_default = 1,
};
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index b2b80c9..4e40196 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -240,8 +240,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
}
}
+static void pc_compat_2_0(QEMUMachineInitArgs *args)
+{
+}
+
static void pc_compat_1_7(QEMUMachineInitArgs *args)
{
+ pc_compat_2_0(args);
smbios_defaults = false;
gigabyte_align = false;
option_rom_has_mr = true;
@@ -268,6 +273,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0,
CPUID_EXT_PCLMULQDQ);
}
+static void pc_q35_init_2_0(QEMUMachineInitArgs *args)
+{
+ pc_compat_2_0(args);
+ pc_q35_init(args);
+}
+
static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
{
pc_compat_1_7(args);
@@ -305,7 +316,7 @@ static QEMUMachine pc_q35_machine_v2_0 = {
PC_Q35_2_0_MACHINE_OPTIONS,
.name = "pc-q35-2.0",
.alias = "q35",
- .init = pc_q35_init,
+ .init = pc_q35_init_2_0,
};
#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
--
1.9.0
- [Qemu-devel] [QEMU v7 PATCH 0/7] SMBIOS: build full tables in QEMU, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 1/7] SMBIOS: Rename symbols to better reflect future use, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 3/7] SMBIOS: Use macro to set smbios defaults, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 7/7] SMBIOS: Build aggregate smbios tables and entry point, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 4/7] SMBIOS: Use bitmaps to prevent incompatible comand line options, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 6/7] PC: Add (empty) compat functions for machine version 2.0,
Gabriel L. Somlo <=
- [Qemu-devel] [QEMU v7 PATCH 5/7] E820: Add interface for accessing e820 table, Gabriel L. Somlo, 2014/04/21
- [Qemu-devel] [QEMU v7 PATCH 2/7] SMBIOS: Update header file definitions, Gabriel L. Somlo, 2014/04/21
- Re: [Qemu-devel] [QEMU v7 PATCH 0/7] SMBIOS: build full tables in QEMU, Gerd Hoffmann, 2014/04/23