diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-07 10:46:09 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 10:46:09 +0200 |
| commit | 989e2cd2f9db2edcd347c380dddfeb5b64327b76 (patch) | |
| tree | f803f84b6d6393b6869b36c07bbe3760e7676fe5 /Makefile | |
| parent | Fix mismerge in cpu_post_load (diff) | |
| parent | monitor: QError support (diff) | |
| download | qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.gz qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.bz2 qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.zip | |
Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-merge
* commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa': (22 commits)
monitor: QError support
Introduce QError
utests: Add qstring_from_substr() unit-test
utests: Add qstring_append_chr() unit-test
QString: Introduce qstring_from_substr()
QString: Introduce qstring_append_int()
QString: Introduce qstring_append_chr()
QJSON: Introduce qobject_from_jsonv()
fix I2C slave addressing
Fix qdev property type definition for isa serial/parallel devices
Fix qemu_malloc/qemu_free use in rtl8139.c
Fix free use in xen_backend.c
Fix qemu_free use in scsi-generic.c
Fix qemu_free use in nseries.c
Fix qemu_free use in bt-l2cap.c
Fix qemu_free use in nand.c
Fix qemu_free use in baum.c
Fix qemu_free use in acpi.c
pci: move apb specific stuff to apb_pci.c
configure: use correct cflags in compiler checks
...
Conflicts:
monitor.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -162,7 +162,7 @@ obj-y += qemu-char.o aio.o savevm.o obj-y += msmouse.o ps2.o obj-y += qdev.o qdev-properties.o obj-y += qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o json-lexer.o -obj-y += json-streamer.o json-parser.o qjson.o +obj-y += json-streamer.o json-parser.o qjson.o qerror.o obj-y += qemu-config.o block-migration.o obj-$(CONFIG_BRLAPI) += baum.o @@ -237,14 +237,12 @@ libqemu_common.a: $(obj-y) ###################################################################### -qemu-img.o: config-host.h qemu-img-cmds.h +qemu-img.o: qemu-img-cmds.h qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) -qemu-io.o: config-host.h - qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx |