From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 23 Jan 2012 17:00:26 +0000 (-0600)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b4448d27d7c6ff6e18a1edc8245cb1db783e37c;p=qemu.git

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  kvm: Activate in-kernel irqchip support
  kvm: x86: Add user space part for in-kernel IOAPIC
  kvm: x86: Add user space part for in-kernel i8259
  kvm: x86: Add user space part for in-kernel APIC
  kvm: x86: Establish IRQ0 override control
  kvm: Introduce core services for in-kernel irqchip support
  memory: Introduce memory_region_init_reservation
  ioapic: Factor out base class for KVM reuse
  ioapic: Drop post-load irr initialization
  i8259: Factor out base class for KVM reuse
  i8259: Completely privatize PicState
  apic: Open-code timer save/restore
  apic: Factor out base class for KVM reuse
  apic: Introduce apic_report_irq_delivered
  apic: Inject external NMI events via LINT1
  apic: Stop timer on reset
  kvm: Move kvmclock into hw/kvm folder
  msi: Generalize msix_supported to msi_supported
  hyper-v: initialize Hyper-V CPUID leaves.
  hyper-v: introduce Hyper-V support infrastructure.

Conflicts:
	Makefile.target

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

5b4448d27d7c6ff6e18a1edc8245cb1db783e37c
diff --cc Makefile.target
index bb18d72e42,98cb997abf..092565a1e8
--- a/Makefile.target
+++ b/Makefile.target
@@@ -226,8 -226,9 +228,8 @@@ obj-$(CONFIG_IVSHMEM) += ivshmem.
  obj-y += device-hotplug.o
  
  # Hardware support
 -obj-i386-y += vga.o
  obj-i386-y += mc146818rtc.o pc.o
- obj-i386-y += sga.o apic.o ioapic.o piix_pci.o
 -obj-i386-y += cirrus_vga.o sga.o apic_common.o apic.o ioapic_common.o ioapic.o piix_pci.o
++obj-i386-y += sga.o apic_common.o apic.o ioapic_common.o ioapic.o piix_pci.o
  obj-i386-y += vmport.o
  obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o
  obj-i386-y += debugcon.o multiboot.o