From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfqe-0003IN-N0 for qemu-devel@nongnu.org; Fri, 12 Apr 2013 11:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQfqc-0005bZ-QC for qemu-devel@nongnu.org; Fri, 12 Apr 2013 11:25:08 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:52242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQfqc-0005Xt-Iq for qemu-devel@nongnu.org; Fri, 12 Apr 2013 11:25:06 -0400 From: Markus Armbruster Date: Fri, 12 Apr 2013 17:25:01 +0200 Message-Id: <1365780303-26398-2-git-send-email-armbru@redhat.com> In-Reply-To: <1365780303-26398-1-git-send-email-armbru@redhat.com> References: <1365780303-26398-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] pc: Inline pc_init_pci_1_3() into pc_init_pci_1_2() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, jljusten@gmail.com Just to make the commit after next easier to review. Signed-off-by: Markus Armbruster --- 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 cff8013..da34d3b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -244,7 +244,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 */ -- 1.7.11.7