diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
| commit | 8bdb1d64b87089b23d18d02efbbbd85d44151742 (patch) | |
| tree | e9cb246a234f120fddf1d801d529b5f93b073616 /Makefile | |
| parent | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-merge (diff) | |
| parent | PCI: Convert pci_device_hot_add() to QObject (diff) | |
| download | qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.gz qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.bz2 qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.zip | |
Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-merge
* commit '1c1d7bda2cd507aec72057a1c16094541add9dd6':
PCI: Convert pci_device_hot_add() to QObject
char: Convert qemu_chr_info() to QObject
block: Convert bdrv_info_stats() to QObject
block: Convert bdrv_info() to QObject
migration: Convert do_info_migrate() to QObject
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -248,11 +248,11 @@ libqemu_common.a: $(obj-y) qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") |