[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] qga: add mountpoint usage info to GuestFilesys
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL 03/14] qga: add mountpoint usage info to GuestFilesystemInfo |
Date: |
Tue, 3 Jul 2018 15:52:10 -0500 |
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>
Signed-off-by: Michael Roth <address@hidden>
---
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 9284e71666..ae8535e497 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 1045cef386..2df6356b8c 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -848,6 +848,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
#
@@ -855,6 +857,7 @@
##
{ 'struct': 'GuestFilesystemInfo',
'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str',
+ '*used-bytes': 'uint64', '*total-bytes': 'uint64',
'disk': ['GuestDiskAddress']} }
##
--
2.11.0
- [Qemu-devel] [PULL 13/14] qga: systemd hibernate/suspend/hybrid-sleep support, (continued)
- [Qemu-devel] [PULL 13/14] qga: systemd hibernate/suspend/hybrid-sleep support, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 04/14] qga-win: add driver path usage to GuestFilesystemInfo, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 09/14] qga: refactoring qmp_guest_suspend_* functions, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 05/14] test-qga: add trivial tests for some commands, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 08/14] qemu-ga: make get-fsinfo work over pci bridges, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 11/14] qga: guest_suspend: decoupling pm-utils and sys logic, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 07/14] qga-win: Fixing msi upgrade disallow in WiX file, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 14/14] qga: removing bios_supports_mode, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 01/14] qga: unset frozen state if no mount points are frozen, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 12/14] qga: removing switch statements, adding run_process_child, Michael Roth, 2018/07/03
- [Qemu-devel] [PULL 03/14] qga: add mountpoint usage info to GuestFilesystemInfo,
Michael Roth <=
- Re: [Qemu-devel] [PULL 00/14] qga patch queue for soft-freeze, Peter Maydell, 2018/07/05