From nobody Sat Nov 1 22:28:54 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 1527833567758289.6608042223886; Thu, 31 May 2018 23:12:47 -0700 (PDT) Received: from localhost ([::1]:47597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOdIp-0003Jc-SG for importer@patchew.org; Fri, 01 Jun 2018 02:12:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOdHv-00030w-G9 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 02:11:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOdHs-00026A-9j for qemu-devel@nongnu.org; Fri, 01 Jun 2018 02:11:47 -0400 Received: from m15-114.126.com ([220.181.15.114]:51558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOdHr-0001xM-JH for qemu-devel@nongnu.org; Fri, 01 Jun 2018 02:11:44 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp7 (Coremail) with SMTP id DsmowADXCo2K4xBbjgpSCA--.27560S2; Fri, 01 Jun 2018 14:11:32 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=fqfY90qw8AIP4WUhxP nFfL9Qfui3eH+a2DxlGihipQ0=; b=Kc9AUdCl+sL5O+8rDP7LXfRheCo0mCUTyD SQGYBLSe2weTi6qea2hGHrUXYxHb85k/iOCrXFOrYov/tPDhU0S+9DJj8UdcI39Z ndiu+kcA/sy6JOYHqMFKGR6X0X+uO1gBlBRGkGaXYqiNaYwFmVkVttfKTjF0Lhu1 XggxaFIFA= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Fri, 1 Jun 2018 14:11:21 +0800 Message-Id: <20180601061121.13161-1-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 X-CM-TRANSID: DsmowADXCo2K4xBbjgpSCA--.27560S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAF48tw47ur43uF15Jw4xWFg_yoW5Jw4UpF 45AF1rKrW8JF97GrsxZFy29r1Fqa92yryjg343X34YyFyUJrySg3sFka4kZr13ZrZ0kF4F v3y8t3Wagw47CrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jrjjDUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbikhRYrlpD5IAFdAAAs8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.114 Subject: [Qemu-devel] [PATCH v4] 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 Cc: Eric Blake Signed-off-by: Chen Hanxiao --- v2: add description in qapi-schema and version numbers v3: use float for usage to get more precision. v4: make usage as a best-effort query and mark it as optional. 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..4facc76953 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 used, nonroot_total; + double 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)) { + fs->has_usage =3D false; + fs->usage =3D -1; + } else { + used =3D buf.f_blocks - buf.f_bfree; + nonroot_total =3D used + buf.f_bavail; + usage =3D (double) used / nonroot_total; + + fs->has_usage =3D true; + fs->usage =3D usage; + } + g_free(devpath); + return fs; } =20 diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 17884c7c70..fcd427e86d 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -846,6 +846,7 @@ # @name: disk name # @mountpoint: mount point path # @type: file system type string +# @usage: file system usage, fraction between 0 and 1 (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,7 +854,7 @@ ## { 'struct': 'GuestFilesystemInfo', 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', - 'disk': ['GuestDiskAddress']} } + '*usage': 'number', 'disk': ['GuestDiskAddress']} } =20 ## # @guest-get-fsinfo: --=20 2.17.0