From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 12 Apr 2013 15:25:01 +0000 (+0200)
Subject: pc: Inline pc_init_pci_1_3() into pc_init_pci_1_2()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=36afbc5135062ccd7d0166ffc3ddbca052d05c71;p=qemu.git

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>
---

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 */