Commit 2870dc34 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qemu-ga: move qemu-ga files to qga/ 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1422e32d

Makefile

+5 −4
Original line number Diff line number Diff line
@@ -200,13 +200,13 @@ endif 
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py



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

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")

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

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")

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

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")



qapi-types.c qapi-types.h :\
@@ -222,7 +222,8 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)



qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a

qemu-ga$(EXESUF): $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a

	$(call LINK, $^)



clean:

# avoid old build problems by removing potentially incorrect old files

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ universal-obj-y += $(qapi-obj-y) 
######################################################################

# guest agent



qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o

qga-obj-y = qga/ module.o qemu-tool.o

qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o



vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)

qga/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
qga-obj-y = commands.o guest-agent-command-state.o

qga-obj-y = commands.o guest-agent-command-state.o main.o

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-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o

qemu-ga.c→qga/main.c

+0 −0

File moved.

View file

qapi-schema-guest.json→qga/qapi-schema.json

+0 −0

File moved.

View file