aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-04-12 17:25:01 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-24 13:23:50 -0500
commit36afbc5135062ccd7d0166ffc3ddbca052d05c71 (patch)
tree38ef49174e917b65ffd7e0e3f0a41014a41f9ae9
parent1bfffe21a686ab273abce5ef12e8d2a3de320023 (diff)
pc: Inline pc_init_pci_1_3() into pc_init_pci_1_2()
Just to make the commit after next easier to review. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-id: 1365780303-26398-2-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/i386/pc_piix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 943758ad30..030e6343eb 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -245,7 +245,8 @@ static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
{
disable_kvm_pv_eoi();
- pc_init_pci_1_3(args);
+ enable_compat_apic_id_mode();
+ pc_init_pci(args);
}
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */