[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/23] disable guest-provided stats on "info balloon
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 03/23] disable guest-provided stats on "info balloon" command |
Date: |
Fri, 1 Oct 2010 15:19:07 -0300 |
From: Eduardo Habkost <address@hidden>
The addition of memory stats reporting to the virtio balloon causes
the 'info balloon' command to become asynchronous. This is a regression
because in some cases it can hang the user monitor.
This is an alternative to Adam Litke's patch. Adam's patch disabled the
corresponding (guest-visible) virtio feature bit, causing issues for migration.
Original discussion is available at:
http://marc.info/?l=qemu-devel&m=128448124328314&w=2
Signed-off-by: Eduardo Habkost <address@hidden>
Acked-by: Adam Litke <address@hidden
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/virtio-balloon.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 1e74674..8adddea 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -29,6 +29,10 @@
#include <sys/mman.h>
#endif
+/* Disable guest-provided stats by now
(https://bugzilla.redhat.com/show_bug.cgi?id=623903) */
+#define ENABLE_GUEST_STATS 0
+
+
typedef struct VirtIOBalloon
{
VirtIODevice vdev;
@@ -83,12 +87,14 @@ static QObject *get_stats_qobject(VirtIOBalloon *dev)
VIRTIO_BALLOON_PFN_SHIFT);
stat_put(dict, "actual", actual);
+#if ENABLE_GUEST_STATS
stat_put(dict, "mem_swapped_in", dev->stats[VIRTIO_BALLOON_S_SWAP_IN]);
stat_put(dict, "mem_swapped_out", dev->stats[VIRTIO_BALLOON_S_SWAP_OUT]);
stat_put(dict, "major_page_faults", dev->stats[VIRTIO_BALLOON_S_MAJFLT]);
stat_put(dict, "minor_page_faults", dev->stats[VIRTIO_BALLOON_S_MINFLT]);
stat_put(dict, "free_mem", dev->stats[VIRTIO_BALLOON_S_MEMFREE]);
stat_put(dict, "total_mem", dev->stats[VIRTIO_BALLOON_S_MEMTOT]);
+#endif
return QOBJECT(dict);
}
@@ -214,7 +220,7 @@ static void virtio_balloon_to_target(void *opaque,
ram_addr_t target,
}
dev->stats_callback = cb;
dev->stats_opaque_callback_data = cb_data;
- if (dev->vdev.guest_features & (1 << VIRTIO_BALLOON_F_STATS_VQ)) {
+ if (ENABLE_GUEST_STATS && (dev->vdev.guest_features & (1 <<
VIRTIO_BALLOON_F_STATS_VQ))) {
virtqueue_push(dev->svq, &dev->stats_vq_elem,
dev->stats_vq_offset);
virtio_notify(&dev->vdev, dev->svq);
} else {
--
1.7.3.1.50.g1e633
- [Qemu-devel] [PULL 00/23]: Monitor queue, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 01/23] Add support for JSON pretty printing, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 02/23] Add option to turn on JSON pretty printing in monitor, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 03/23] disable guest-provided stats on "info balloon" command,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 04/23] Monitor: Introduce search_dispatch_table(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 05/23] QMP: handle_qmp_command(): Move 'cmd' sanity check, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 06/23] QMP: Don't use do_info(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 08/23] Monitor: Drop is_async_return(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 07/23] Monitor: Drop QMP bits from do_info(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 09/23] Monitor: Convert do_info() back to HMP, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 10/23] Monitor: Introduce the qmp-commands.hx file, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 11/23] QMP: Introduce qmp_find_cmd(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 12/23] QMP: Introduce command dispatch table, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 13/23] QMP: Introduce query commands dispatch table, Luiz Capitulino, 2010/10/01