qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, jljusten@gmail.com
Subject: [Qemu-devel] [PATCH 1/3] pc: Inline pc_init_pci_1_3() into pc_init_pci_1_2()
Date: Fri, 12 Apr 2013 17:25:01 +0200	[thread overview]
Message-ID: <1365780303-26398-2-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1365780303-26398-1-git-send-email-armbru@redhat.com>

Just to make the commit after next easier to review.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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

  reply	other threads:[~2013-04-12 15:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-12 15:25 [Qemu-devel] [PATCH 0/3] Kill the "use flash device for BIOS unless KVM" misfeature Markus Armbruster
2013-04-12 15:25 ` Markus Armbruster [this message]
2013-04-12 15:25 ` [Qemu-devel] [PATCH 2/3] pc: Split pc_init_pci_1_0() off pc_init_pci_1_2() Markus Armbruster
2013-04-12 15:25 ` [Qemu-devel] [PATCH 3/3] pc: Kill the "use flash device for BIOS unless KVM" misfeature Markus Armbruster
2013-04-25 20:55 ` [Qemu-devel] [PATCH 0/3] " Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365780303-26398-2-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=jljusten@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).