From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEdbz-0004JH-HP for qemu-devel@nongnu.org; Fri, 04 May 2018 12:31:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEdbw-0007tU-C2 for qemu-devel@nongnu.org; Fri, 04 May 2018 12:31:11 -0400 Received: from hqdc-proxy-mwg11-o.oracle.com ([148.87.23.14]:58638 helo=jhdev.us.oracle.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEdbw-0007sO-6C for qemu-devel@nongnu.org; Fri, 04 May 2018 12:31:08 -0400 From: Jonathan Helman Date: Fri, 4 May 2018 09:30:45 -0700 Message-Id: <1525451445-5131-1-git-send-email-jonathan.helman@oracle.com> Subject: [Qemu-devel] [PATCH] virtio-balloon: fix internal stat name array to match Linux kernel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: jasowang@redhat.com, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org, Jonathan Helman , Rob Gardner , Thomas Tai The Linux kernel commit b40000325044 ("virtio_balloon: add array of stat names") defines an array of stat name strings for consumers of the virtio interface to use via the virtio_balloon.h header file, rather than requiring each consumer to define its own. But at present, the stat names defined in this array by the Linux kernel do not match up with those defined internally by QEMU. This patch fixes this inconsistency by changing the QEMU stat names to match those defined by the Linux kernel. Signed-off-by: Jonathan Helman Cc: Rob Gardner Cc: Thomas Tai --- docs/virtio-balloon-stats.txt | 4 ++-- hw/virtio/virtio-balloon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/virtio-balloon-stats.txt b/docs/virtio-balloon-stats.txt index 9985e1d..7c69fdb 100644 --- a/docs/virtio-balloon-stats.txt +++ b/docs/virtio-balloon-stats.txt @@ -34,8 +34,8 @@ which will return a dictionary containing: - stat-total-memory - stat-available-memory - stat-disk-caches - - stat-htlb-pgalloc - - stat-htlb-pgfail + - stat-hugetlb-allocations + - stat-hugetlb-failures o A key named last-update, which contains the last stats update timestamp in seconds. Since this timestamp is generated by the host, diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 1f7a87f..8421d9f 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -52,8 +52,8 @@ static const char *balloon_stat_names[] = { [VIRTIO_BALLOON_S_MEMTOT] = "stat-total-memory", [VIRTIO_BALLOON_S_AVAIL] = "stat-available-memory", [VIRTIO_BALLOON_S_CACHES] = "stat-disk-caches", - [VIRTIO_BALLOON_S_HTLB_PGALLOC] = "stat-htlb-pgalloc", - [VIRTIO_BALLOON_S_HTLB_PGFAIL] = "stat-htlb-pgfail", + [VIRTIO_BALLOON_S_HTLB_PGALLOC] = "stat-hugetlb-allocations", + [VIRTIO_BALLOON_S_HTLB_PGFAIL] = "stat-hugetlb-failures", [VIRTIO_BALLOON_S_NR] = NULL }; -- 1.8.3.1 Based-on: <1524799751-151698-5-git-send-email-mst@redhat.com> ([PULL 4/4] virtio-balloon: add hugetlb page allocation counts)