diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:21:46 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:21:46 -0500 |
| commit | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (patch) | |
| tree | 223ee0630a56a8d1410d5ad283996486ec434ab7 /Makefile.objs | |
| parent | 057643f6c4751651ab640edb9b445cb3816edffc (diff) | |
| parent | 5bc465e4b1b6f4582a400c0a7033a1c841744278 (diff) | |
| download | qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.zip qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.gz qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.bz2 | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index c849e51..7b0739c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -405,6 +405,9 @@ qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi- qapi-nested-y += qmp-registry.o qmp-dispatch.o qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) +common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y) +common-obj-y += qmp.o hmp.o + ###################################################################### # guest agent |