From 36afbc5135062ccd7d0166ffc3ddbca052d05c71 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 12 Apr 2013 17:25:01 +0200 Subject: [PATCH] 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 Message-id: 1365780303-26398-2-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori --- hw/i386/pc_piix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 943758ad30e..030e6343eb2 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 */ -- 2.39.5