diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi.c | 2 | ||||
| -rw-r--r-- | hw/pci.c | 2 | ||||
| -rw-r--r-- | hw/virtio-balloon.c | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/hw/acpi.c b/hw/acpi.c index 069e05fc7a..8071e7beba 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -161,7 +161,7 @@ int acpi_table_add(const char *t) /* off < length is necessary because file size can be changed under our foot */ - while(s.st_size && off < length); { + while(s.st_size && off < length) { int r; r = read(fd, p + off, s.st_size); if (r > 0) { diff --git a/hw/pci.c b/hw/pci.c index 6d0934df9a..1280d4d785 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -604,7 +604,7 @@ static int pci_init_multifunction(PCIBus *bus, PCIDevice *dev) } /* - * multifuction bit is interpreted in two ways as follows. + * multifunction bit is interpreted in two ways as follows. * - all functions must set the bit to 1. * Example: Intel X53 * - function 0 must set the bit, but the rest function (> 0) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 1e746741ff..8adddeaa53 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 { |