[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5.2 1/2] qga: add mountpoint usage info to GuestFil
From: |
Chen Hanxiao |
Subject: |
[Qemu-devel] [PATCH v5.2 1/2] qga: add mountpoint usage info to GuestFilesystemInfo |
Date: |
Thu, 14 Jun 2018 16:06:06 +0800 |
From: Chen Hanxiao <address@hidden>
This patch adds support for getting the usage of mounted
filesystem.
The usage of fs stored as used_bytes and total_bytes.
It's very useful when we try to monitor guest's filesystem.
Cc: Michael Roth <address@hidden>
Cc: Daniel P. Berrangé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Chen Hanxiao <address@hidden>
---
v2:
add description in qapi-schema and version numbers
v3:
use float for usage to get more precision.
v4:
make usage a best-effort query and mark it as optional.
v5:
report used-bytes and total-bytes in usage
v5.1:
unpack usage as used-bytes and total-bytes
v5.2:
remove useless assigments and fix doc
qga/commands-posix.c | 15 +++++++++++++++
qga/qapi-schema.json | 3 +++
2 files changed, 18 insertions(+)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index eae817191b..e0e7993bcf 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -46,6 +46,7 @@ extern char **environ;
#include <arpa/inet.h>
#include <sys/socket.h>
#include <net/if.h>
+#include <sys/statvfs.h>
#ifdef FIFREEZE
#define CONFIG_FSFREEZE
@@ -1072,6 +1073,8 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct
FsMount *mount,
Error **errp)
{
GuestFilesystemInfo *fs = g_malloc0(sizeof(*fs));
+ struct statvfs buf;
+ unsigned long used, nonroot_total, fr_size;
char *devpath = g_strdup_printf("/sys/dev/block/%u:%u",
mount->devmajor, mount->devminor);
@@ -1079,7 +1082,19 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct
FsMount *mount,
fs->type = g_strdup(mount->devtype);
build_guest_fsinfo_for_device(devpath, fs, errp);
+ if (statvfs(fs->mountpoint, &buf) == 0) {
+ fr_size = buf.f_frsize;
+ used = buf.f_blocks - buf.f_bfree;
+ nonroot_total = used + buf.f_bavail;
+ fs->used_bytes = used * fr_size;
+ fs->total_bytes = nonroot_total * fr_size;
+
+ fs->has_total_bytes = true;
+ fs->has_used_bytes = true;
+ }
+
g_free(devpath);
+
return fs;
}
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 17884c7c70..b1bbb78c59 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -846,6 +846,8 @@
# @name: disk name
# @mountpoint: mount point path
# @type: file system type string
+# @used-bytes: file system used bytes (since 3.0)
+# @total-bytes: non-root file system total bytes (since 3.0)
# @disk: an array of disk hardware information that the volume lies on,
# which may be empty if the disk type is not supported
#
@@ -853,6 +855,7 @@
##
{ 'struct': 'GuestFilesystemInfo',
'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str',
+ '*used-bytes': 'uint64', '*total-bytes': 'uint64',
'disk': ['GuestDiskAddress']} }
##
--
2.17.1