OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: Split pc_init_pci_1_0() off pc_init_pci_1_2()

Browse Source 
Just to make the next commit easier to review.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2013-04-12 17:25:02 +02:00 committed by Anthony Liguori
parent 36afbc5135
commit 6fd028f64f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/i386/pc_piix.c
View File

@ -241,7 +241,7 @@ static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
pc_init_pci(args); pc_init_pci(args);
} }
/* PC machine init function for pc-0.14 to pc-1.2 */ /* PC machine init function for pc-1.1 to pc-1.2 */
static void pc_init_pci_1_2(QEMUMachineInitArgs *args) static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
{ {
disable_kvm_pv_eoi(); disable_kvm_pv_eoi();
@ -249,6 +249,14 @@ static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
pc_init_pci(args); pc_init_pci(args);
} }
/* PC machine init function for pc-0.14 to pc-1.0 */
static void pc_init_pci_1_0(QEMUMachineInitArgs *args)
{
disable_kvm_pv_eoi();
enable_compat_apic_id_mode();
pc_init_pci(args);
}
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */ /* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
{ {
@ -462,7 +470,7 @@ static QEMUMachine pc_machine_v1_1 = {
static QEMUMachine pc_machine_v1_0 = { static QEMUMachine pc_machine_v1_0 = {
.name = "pc-1.0", .name = "pc-1.0",
.desc = "Standard PC", .desc = "Standard PC",
.init = pc_init_pci_1_2, .init = pc_init_pci_1_0,
.max_cpus = 255, .max_cpus = 255,
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_1_0, PC_COMPAT_1_0,
@ -478,7 +486,7 @@ static QEMUMachine pc_machine_v1_0 = {
static QEMUMachine pc_machine_v0_15 = { static QEMUMachine pc_machine_v0_15 = {
.name = "pc-0.15", .name = "pc-0.15",
.desc = "Standard PC", .desc = "Standard PC",
.init = pc_init_pci_1_2, .init = pc_init_pci_1_0,
.max_cpus = 255, .max_cpus = 255,
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_15, PC_COMPAT_0_15,
@ -511,7 +519,7 @@ static QEMUMachine pc_machine_v0_15 = {
static QEMUMachine pc_machine_v0_14 = { static QEMUMachine pc_machine_v0_14 = {
.name = "pc-0.14", .name = "pc-0.14",
.desc = "Standard PC", .desc = "Standard PC",
.init = pc_init_pci_1_2, .init = pc_init_pci_1_0,
.max_cpus = 255, .max_cpus = 255,
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_0_14, PC_COMPAT_0_14,