[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE |
Date: |
Mon, 23 Jun 2014 12:36:34 -0400 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
balloon.c | 13 -------------
docs/qmp/qmp-events.txt | 17 -----------------
hw/virtio/virtio-balloon.c | 6 ++++--
include/sysemu/balloon.h | 2 --
monitor.c | 3 +--
qapi-event.json | 13 +++++++++++++
6 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/balloon.c b/balloon.c
index e321f2c..b70da4f 100644
--- a/balloon.c
+++ b/balloon.c
@@ -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;
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 4fbc3de..1b0e25f 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -1,23 +1,6 @@
QEMU Machine Protocol Events
============================
-BALLOON_CHANGE
---------------
-
-Emitted when the guest changes the actual BALLOON level. This
-value is equivalent to the 'actual' field return by the
-'query-balloon' command
-
-Data:
-
-- "actual": actual level of the guest memory balloon in bytes (json-number)
-
-Example:
-
-{ "event": "BALLOON_CHANGE",
- "data": { "actual": 944766976 },
- "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
-
GUEST_PANICKED
--------------
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 22cd52e..2a2e58a 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -24,6 +24,7 @@
#include "sysemu/kvm.h"
#include "exec/address-spaces.h"
#include "qapi/visitor.h"
+#include "qapi-event.h"
#if defined(__linux__)
#include <sys/mman.h>
@@ -289,8 +290,9 @@ static void virtio_balloon_set_config(VirtIODevice *vdev,
memcpy(&config, config_data, sizeof(struct virtio_balloon_config));
dev->actual = le32_to_cpu(config.actual);
if (dev->actual != oldactual) {
- qemu_balloon_changed(ram_size -
- ((ram_addr_t) dev->actual << VIRTIO_BALLOON_PFN_SHIFT));
+ qapi_event_send_balloon_change(ram_size -
+ ((ram_addr_t) dev->actual << VIRTIO_BALLOON_PFN_SHIFT),
+ &error_abort);
}
}
diff --git a/include/sysemu/balloon.h b/include/sysemu/balloon.h
index bd9d395..0345e01 100644
--- a/include/sysemu/balloon.h
+++ b/include/sysemu/balloon.h
@@ -24,6 +24,4 @@ int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
QEMUBalloonStatus *stat_func, void *opaque);
void qemu_remove_balloon_handler(void *opaque);
-void qemu_balloon_changed(int64_t actual);
-
#endif
diff --git a/monitor.c b/monitor.c
index 2f64195..eacef61 100644
--- a/monitor.c
+++ b/monitor.c
@@ -616,6 +616,7 @@ static void monitor_qapi_event_init(void)
/* Limit guest-triggerable events to 1 per second */
monitor_qapi_event_throttle(QAPI_EVENT_RTC_CHANGE, 1000);
monitor_qapi_event_throttle(QAPI_EVENT_WATCHDOG, 1000);
+ monitor_qapi_event_throttle(QAPI_EVENT_BALLOON_CHANGE, 1000);
qmp_event_set_func_emit(monitor_qapi_event_queue);
}
@@ -742,8 +743,6 @@ monitor_protocol_event_throttle(MonitorEvent event,
* and initialize state */
static void monitor_protocol_event_init(void)
{
- /* Limit RTC & BALLOON events to 1 per second */
- monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000);
/* limit the rate of quorum events to avoid hammering the management */
monitor_protocol_event_throttle(QEVENT_QUORUM_REPORT_BAD, 1000);
monitor_protocol_event_throttle(QEVENT_QUORUM_FAILURE, 1000);
diff --git a/qapi-event.json b/qapi-event.json
index 5188a72..b7438d5 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -253,3 +253,16 @@
##
{ 'event': 'ACPI_DEVICE_OST',
'data': { 'info': 'ACPIOSTInfo' } }
+
+##
+# @BALLOON_CHANGE
+#
+# Emitted when the guest changes the actual BALLOON level. This value is
+# equivalent to the @actual field return by the 'query-balloon' command
+#
+# @actual: actual level of the guest memory balloon in bytes
+#
+# Since: 1.2
+##
+{ 'event': 'BALLOON_CHANGE',
+ 'data': { 'actual': 'int' } }
--
1.9.3
- [Qemu-devel] [PULL 31/43] qapi event: convert VNC events, (continued)
- [Qemu-devel] [PULL 31/43] qapi event: convert VNC events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 35/43] qapi event: convert GUEST_PANICKED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 36/43] qapi event: convert QUORUM events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 38/43] qemu-char: introduce qemu_chr_alloc, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type(), Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 10/43] qapi script: add event support, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE,
Luiz Capitulino <=
- [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 09/43] qapi: add event helper functions, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 19/43] qapi event: convert RESUME, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 37/43] qapi event: clean up, Luiz Capitulino, 2014/06/23