|
 |
9ae3a8 |
From f346ff306b647fe1db3ffe8c9880178382c7b98d Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 8 Nov 2013 06:13:58 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 3/4] qapi: enable generation of native list code
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1383891239-29531-4-git-send-email-akong@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55610
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 3/4] qapi: enable generation of native list code
|
|
|
9ae3a8 |
Bugzilla: 848203
|
|
|
9ae3a8 |
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Also, fix a dependency issue with libqemuutil: qemu-sockets.c needs
|
|
|
9ae3a8 |
qapi-types.c/qapi-visit.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 0b400e792718f59275d5d54c21de9a589b35a81f)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
Makefile | 10 +++++-----
|
|
|
9ae3a8 |
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
Makefile | 10 +++++-----
|
|
|
9ae3a8 |
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/Makefile b/Makefile
|
|
|
9ae3a8 |
index 45048a3..66774de 100644
|
|
|
9ae3a8 |
--- a/Makefile
|
|
|
9ae3a8 |
+++ b/Makefile
|
|
|
9ae3a8 |
@@ -183,7 +183,7 @@ Makefile: $(version-obj-y) $(version-lobj-y)
|
|
|
9ae3a8 |
# Build libraries
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
libqemustub.a: $(stub-obj-y)
|
|
|
9ae3a8 |
-libqemuutil.a: $(util-obj-y)
|
|
|
9ae3a8 |
+libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
######################################################################
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -239,20 +239,20 @@ $(SRC_PATH)/qapi-schema-rhel.json: $(SRC_PATH)/qapi-schema.json
|
|
|
9ae3a8 |
ifeq ($(CONFIG_LIVE_BLOCK_OPS),y)
|
|
|
9ae3a8 |
qapi-types.c qapi-types.h :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhev.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
|
|
|
9ae3a8 |
- $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
+ $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -b < $<, " GEN $@")
|
|
|
9ae3a8 |
qapi-visit.c qapi-visit.h :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhev.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
|
|
|
9ae3a8 |
- $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
+ $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." -b < $<, " GEN $@")
|
|
|
9ae3a8 |
qmp-commands.h qmp-marshal.c :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhev.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
|
|
|
9ae3a8 |
$(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
else
|
|
|
9ae3a8 |
qapi-types.c qapi-types.h :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhel.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
|
|
|
9ae3a8 |
- $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
+ $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." -b < $<, " GEN $@")
|
|
|
9ae3a8 |
qapi-visit.c qapi-visit.h :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhel.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
|
|
|
9ae3a8 |
- $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
+ $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "." -b < $<, " GEN $@")
|
|
|
9ae3a8 |
qmp-commands.h qmp-marshal.c :\
|
|
|
9ae3a8 |
$(SRC_PATH)/qapi-schema-rhel.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
|
|
|
9ae3a8 |
$(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@")
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|