Commit 834a3f34 authored by Markus Armbruster's avatar Markus Armbruster Committed by Eric Blake
Browse files

qapi: Rename generated qmp-marshal.c to qmp-commands.c 



All generated .c are named like their .h, except for qmp-marshal.c and
qmp-commands.h.  To add to the confusion, tests-qmp-commands.c falsely
matches generated test-qmp-commands.h.

Get rid of this unnecessary complication.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180211093607.27351-19-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent cf40a0a5

.gitignore

+1 −2
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ 
/qapi-visit.[ch]

/qapi-event.[ch]

/qapi-doc.texi

/qmp-commands.h

/qmp-commands.[ch]

/qmp-introspect.[ch]

/qmp-marshal.c

/qemu-doc.html

/qemu-doc.info

/qemu-doc.txt

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ include $(SRC_PATH)/rules.mak 


GENERATED_FILES = qemu-version.h config-host.h qemu-options.def

GENERATED_FILES += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h

GENERATED_FILES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c

GENERATED_FILES += qmp-commands.c qapi-types.c qapi-visit.c qapi-event.c

GENERATED_FILES += qmp-introspect.h

GENERATED_FILES += qmp-introspect.c

GENERATED_FILES += qapi-doc.texi
@@ -495,7 +495,7 @@ $(SRC_PATH)/scripts/qapi-gen.py 


qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \

qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h \

qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c \

qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-commands.c \

qga/qapi-generated/qga-qapi-doc.texi: \

qga/qapi-generated/qapi-gen-timestamp ;

qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py)
@@ -521,7 +521,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ 


qapi-types.c qapi-types.h \

qapi-visit.c qapi-visit.h \

qmp-commands.h qmp-marshal.c \

qmp-commands.h qmp-commands.c \

qapi-event.c qapi-event.h \

qmp-introspect.h qmp-introspect.c \

qapi-doc.texi: \

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ common-obj-$(CONFIG_FDT) += device_tree.o 
######################################################################

# qapi



common-obj-y += qmp-marshal.o

common-obj-y += qmp-commands.o

common-obj-y += qmp-introspect.o

common-obj-y += qmp.o hmp.o

endif

docs/devel/qapi-code-gen.txt

+3 −3
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ declares qmp_COMMAND() that the user must implement. 


The following files are generated:



$(prefix)qmp-marshal.c: Command marshal/dispatch functions for each

$(prefix)qmp-commands.c: Command marshal/dispatch functions for each

                         QMP command defined in the schema



$(prefix)qmp-commands.h: Function prototypes for the QMP commands
@@ -1170,7 +1170,7 @@ Example: 
    void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp);



    #endif

    $ cat qapi-generated/example-qmp-marshal.c

    $ cat qapi-generated/example-qmp-commands.c

[Uninteresting stuff omitted...]



    static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in, QObject **ret_out, Error **errp)

qga/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o 
qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o

qga-obj-$(CONFIG_WIN32) += vss-win32.o

qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o

qga-obj-y += qapi-generated/qga-qmp-marshal.o

qga-obj-y += qapi-generated/qga-qmp-commands.o



qga-vss-dll-obj-$(CONFIG_QGA_VSS) += vss-win32/