From nobody Sat Nov 1 22:28:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527670974196292.89525035483405; Wed, 30 May 2018 02:02:54 -0700 (PDT) Received: from localhost ([::1]:37068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNx0O-0005WQ-Nm for importer@patchew.org; Wed, 30 May 2018 05:02:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNwzL-0005Df-AP for qemu-devel@nongnu.org; Wed, 30 May 2018 05:01:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNwzH-0001HP-Bn for qemu-devel@nongnu.org; Wed, 30 May 2018 05:01:47 -0400 Received: from m15-111.126.com ([220.181.15.111]:52688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNwzG-0001Gv-Gm for qemu-devel@nongnu.org; Wed, 30 May 2018 05:01:43 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp1 (Coremail) with SMTP id C8mowADnLqdiaA5bh4zFBw--.31530S2; Wed, 30 May 2018 17:01:35 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ebiMR/1SZOi76OHQar sKukIdi89fx8vGB175t1b2J14=; b=Wv6N/1z957IGd5nUwQrQ9AiF2aKjLuRk85 fE6V7/kdkVLwSHQ1Cn/OoOi3Y255+jUpACns4I9tuznzKzF/PCfYIrzBOyOHGU70 cKrcdrlxM85ep8XaUK2UFKIqw/cKZOHlCGT8ullH0y1KDPZdiAVjGyIznvsInjHj 4wuRV1Mrw= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 17:01:21 +0800 Message-Id: <20180530090121.28154-1-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 X-CM-TRANSID: C8mowADnLqdiaA5bh4zFBw--.31530S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFy5uFyfJr4UtFW3CrWruFg_yoW5Jr1rp3 WYy3WrtrW8JF97GrsxAF17tr1rtanIyr1jg39rX3yYyFyUJF92g3ZFka4kZw1fZrZ0ka1F v3y8t3Wa9w47CwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j0pB-UUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbikg9WrlpD5Gw8+gAAsy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.111 Subject: [Qemu-devel] [PATCH v2] qga: add mountpoint usage to GuestFilesystemInfo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Chen Hanxiao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chen Hanxiao This patch adds support for getting the usage of mounted filesystem. It's very useful when we try to monitor guest's filesystem. Cc: Michael Roth Signed-off-by: Chen Hanxiao --- v2: add description in qapi-schema and version numbers qga/commands-posix.c | 17 +++++++++++++++++ qga/qapi-schema.json | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0dc219dbcf..0d93c47a5d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -46,6 +46,7 @@ extern char **environ; #include #include #include +#include =20 #ifdef FIFREEZE #define CONFIG_FSFREEZE @@ -1072,6 +1073,9 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct= FsMount *mount, Error **errp) { GuestFilesystemInfo *fs =3D g_malloc0(sizeof(*fs)); + struct statvfs buf; + unsigned long u100, used, nonroot_total; + int usage; char *devpath =3D g_strdup_printf("/sys/dev/block/%u:%u", mount->devmajor, mount->devminor); =20 @@ -1079,7 +1083,20 @@ static GuestFilesystemInfo *build_guest_fsinfo(struc= t FsMount *mount, fs->type =3D g_strdup(mount->devtype); build_guest_fsinfo_for_device(devpath, fs, errp); =20 + if (statvfs(fs->mountpoint, &buf)) { + error_setg_errno(errp, errno, "Failed to get statvfs"); + return NULL; + } + + used =3D buf.f_blocks - buf.f_bfree; + u100 =3D 100 * used; + nonroot_total =3D used + buf.f_bavail; + usage =3D u100 / nonroot_total + (u100 % nonroot_total !=3D 0); + + fs->usage =3D usage; + g_free(devpath); + return fs; } =20 diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 17884c7c70..98611b49af 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -846,13 +846,14 @@ # @name: disk name # @mountpoint: mount point path # @type: file system type string +# @usage: file system usage, integer between 0 and 100 (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 # # Since: 2.2 ## { 'struct': 'GuestFilesystemInfo', - 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', + 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', 'usage': 'in= t', 'disk': ['GuestDiskAddress']} } =20 ## --=20 2.17.0