Commit 089a3948 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging 



* remotes/qmp-unstable/queue/qmp: (43 commits)
  monitor: protect event emission
  monitor: protect outbuf and mux_out with mutex
  qemu-char: make writes thread-safe
  qemu-char: move pty_chr_update_read_handler around
  qemu-char: do not call chr_write directly
  qemu-char: introduce qemu_chr_alloc
  qapi event: clean up
  qapi event: convert QUORUM events
  qapi event: convert GUEST_PANICKED
  qapi event: convert BALLOON_CHANGE
  qmp: convert ACPI_DEVICE_OST event
  qapi event: convert SPICE events
  qapi event: convert VNC events
  qapi event: convert NIC_RX_FILTER_CHANGED
  qapi event: convert other BLOCK_JOB events
  qapi event: convert BLOCK_IMAGE_CORRUPTED
  qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR
  qapi event: convert DEVICE_TRAY_MOVED
  qapi event: convert DEVICE_DELETED
  qapi event: convert WATCHDOG
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 27acb9dd d622cb58

Makefile

+15 −6
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ endif 
endif



GENERATED_HEADERS = config-host.h qemu-options.def

GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h

GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c

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

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



GENERATED_HEADERS += trace/generated-events.h

GENERATED_SOURCES += trace/generated-events.c
@@ -202,7 +202,7 @@ Makefile: $(version-obj-y) $(version-lobj-y) 
# Build libraries



libqemustub.a: $(stub-obj-y)

libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o

libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o qapi-event.o



block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL

util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)'
@@ -246,18 +246,27 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 
		$(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \

		"  GEN   $@")



qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \

               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \

               $(SRC_PATH)/qapi-event.json



qapi-types.c qapi-types.h :\

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

$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \

		$(gen-out-type) -o "." -b -i $<, \

		"  GEN   $@")

qapi-visit.c qapi-visit.h :\

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

$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \

		$(gen-out-type) -o "." -b -i $<, \

		"  GEN   $@")

qapi-event.c qapi-event.h :\

$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \

		$(gen-out-type) -o "." -b -i $<, \

		"  GEN   $@")

qmp-commands.h qmp-marshal.c :\

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

$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \

		$(gen-out-type) -o "." -m -i $<, \

		"  GEN   $@")

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ block-obj-y += main-loop.o iohandler.o qemu-timer.o 
block-obj-$(CONFIG_POSIX) += aio-posix.o

block-obj-$(CONFIG_WIN32) += aio-win32.o

block-obj-y += block/

block-obj-y += qapi-types.o qapi-visit.o

block-obj-y += qapi-types.o qapi-visit.o qapi-event.o

block-obj-y += qemu-io-cmds.o



block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o

backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ CharDriverState *chr_baum_init(void) 
    int tty;



    baum = g_malloc0(sizeof(BaumDriverState));

    baum->chr = chr = g_malloc0(sizeof(CharDriverState));

    baum->chr = chr = qemu_chr_alloc();



    chr->opaque = baum;

    chr->chr_write = baum_write;

backends/msmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ CharDriverState *qemu_chr_open_msmouse(void) 
{

    CharDriverState *chr;



    chr = g_malloc0(sizeof(CharDriverState));

    chr = qemu_chr_alloc();

    chr->chr_write = msmouse_chr_write;

    chr->chr_close = msmouse_chr_close;

    chr->explicit_be_open = true;

balloon.c

+0 −13
Original line number Diff line number Diff line
@@ -81,19 +81,6 @@ static int qemu_balloon_status(BalloonInfo *info) 
    return 1;

}



void qemu_balloon_changed(int64_t actual)

{

    QObject *data;



    data = qobject_from_jsonf("{ 'actual': %" PRId64 " }",

                              actual);



    monitor_protocol_event(QEVENT_BALLOON_CHANGE, data);



    qobject_decref(data);

}





BalloonInfo *qmp_query_balloon(Error **errp)

{

    BalloonInfo *info;