diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-04-12 17:25:02 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-24 13:23:50 -0500 |
| commit | 6fd028f64f662c801fd5a54d0e3a1d2baeee93ea (patch) | |
| tree | f95382b3a8da469a1106d806d9ad9e5e9621f4ab | |
| parent | 36afbc5135062ccd7d0166ffc3ddbca052d05c71 (diff) | |
pc: Split pc_init_pci_1_0() off pc_init_pci_1_2()
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>
| -rw-r--r-- | hw/i386/pc_piix.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 030e6343eb..13e1d50fc0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -241,7 +241,7 @@ static void pc_init_pci_1_3(QEMUMachineInitArgs *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) { disable_kvm_pv_eoi(); @@ -249,6 +249,14 @@ static void pc_init_pci_1_2(QEMUMachineInitArgs *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 */ 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 = { .name = "pc-1.0", .desc = "Standard PC", - .init = pc_init_pci_1_2, + .init = pc_init_pci_1_0, .max_cpus = 255, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_0, @@ -478,7 +486,7 @@ static QEMUMachine pc_machine_v1_0 = { static QEMUMachine pc_machine_v0_15 = { .name = "pc-0.15", .desc = "Standard PC", - .init = pc_init_pci_1_2, + .init = pc_init_pci_1_0, .max_cpus = 255, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_15, @@ -511,7 +519,7 @@ static QEMUMachine pc_machine_v0_15 = { static QEMUMachine pc_machine_v0_14 = { .name = "pc-0.14", .desc = "Standard PC", - .init = pc_init_pci_1_2, + .init = pc_init_pci_1_0, .max_cpus = 255, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14, |