summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-22 15:11:29 +0200
committerAvi Kivity <avi@redhat.com>2009-11-22 15:11:29 +0200
commit0b04e23bfe861522689765229143d9671e2308df (patch)
tree6c270982bd88387870e48e40879d7b0cb978ac32 /Makefile.target
parentMerge commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7' into upstream-merge (diff)
parentkvm: x86: Refactor use of interrupt_bitmap (diff)
downloadqemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.gz
qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.tar.bz2
qemu-kvm-0b04e23bfe861522689765229143d9671e2308df.zip
Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-merge
* commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a': (22 commits) kvm: x86: Refactor use of interrupt_bitmap kvm: Add arch reset handler Enable migration without shared storage from the monitor Block live migration Expose a mechanism to trace block writes char: rename qemu_chr_reset to qemu_chr_generic_open char: Remove special init_reset handling char: don't limit data sent to backends to 1k per buffer ARM PB-A8 support LAN9118 emulation mips_r4k: fix reset PPC64: map Uni-North AGP bus aka fix Linux boot PPC64: Partial fix to Linux crash: revert to old devfn PCI: make duplicate devfn allocation fatal Do not execute shell scripts directly mips malta: fix indentation target-mips: fix indentation mips-malta: fix reset mips: fix cpu_reset memory leak fix make clean targets ... Carry changes to qemu-kvm-x86.c. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target
index 26eb1fb07..8ee5b23ac 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -317,6 +317,7 @@ obj-arm-y += framebuffer.o
obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
obj-arm-y += syborg_virtio.o
+obj-arm-y += lan9118.o
obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o