Merge remote branch 'markus/qerror' into staging

[qemu.git] / Makefile.target

diff --git a/Makefile.target b/Makefile.target
index ab3c438fad4ad5e1f4f0e83dac27108e35750b62..56c66523159e91c23e3cd2c1c5fba6c260ef4ada 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -172,6 +172,7 @@ endif #CONFIG_BSD_USER
 ifdef CONFIG_SOFTMMU
 
 obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o
+obj-y += qemu-error.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o