From nobody Mon Feb 9 07:07:22 2026 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 1527867131214425.81573003393146; Fri, 1 Jun 2018 08:32:11 -0700 (PDT) Received: from localhost ([::1]:56225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOm2E-00086p-EG for importer@patchew.org; Fri, 01 Jun 2018 11:32:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOlz0-0006L2-UG for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOlyw-0006R7-De for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:50 -0400 Received: from m15-112.126.com ([220.181.15.112]:45226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOlyv-0006P4-G2 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:46 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp2 (Coremail) with SMTP id DMmowADnHnPzZRFbvO1lCA--.38587S3; Fri, 01 Jun 2018 23:28:38 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=pechS 1dv38Qhzn9nDkrFvEn0HElC/BocC2XeJjd5AtE=; b=bjKMcOfH6RsnQYLzfEjFB y8SuyPCog2KrPeQPlhS0ftAM+BxmxcO5dPMWIuGrbrfwOBFARKtOpIHS1Ytp+34r 9nJq+2QttjlcewhslaXWO7gswa/hOBPyFOSKbV4rmGEfxXS5CoevPEBhGwcIAin5 SLHnVmiYmjvA5qnpzx5wvA= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Fri, 1 Jun 2018 23:27:45 +0800 Message-Id: <20180601152746.17169-2-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601152746.17169-1-chen_han_xiao@126.com> References: <20180601152746.17169-1-chen_han_xiao@126.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: DMmowADnHnPzZRFbvO1lCA--.38587S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxWF15WF13Wr1fWrWDCr43Awb_yoW5Zr47pF W5ZF1rKrW8JF1xGrsxCF17uryrtFnayryDW3yfX34YyFyUGrW093sIk34vvwnxurs5CF4F v3y8tw12gw17Cr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jcOzsUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbiFgdYrlpD5vR+VAAAsG X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.112 Subject: [Qemu-devel] [PATCH v5 1/2] 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 From: Chen Hanxiao 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 Cc: Eric Blake Cc: Daniel P. Berrang=C3=A9 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 a best-effort query and mark it as optional. v5: report used-bytes and total-bytes in usage qga/commands-posix.c | 19 +++++++++++++++++++ qga/qapi-schema.json | 14 +++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0dc219dbcf..83192f284c 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)); + GuestFsUsage *usage; + struct statvfs buf; + unsigned long used, nonroot_total, fr_size; char *devpath =3D g_strdup_printf("/sys/dev/block/%u:%u", mount->devmajor, mount->devminor); =20 @@ -1079,7 +1083,22 @@ 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; + } else { + fr_size =3D buf.f_frsize; + used =3D buf.f_blocks - buf.f_bfree; + nonroot_total =3D used + buf.f_bavail; + usage =3D g_malloc0(sizeof(*usage)); + usage->used_bytes =3D used * fr_size; + usage->total_bytes =3D nonroot_total * fr_size; + + 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..2f742474f6 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -840,12 +840,24 @@ 'bus-type': 'GuestDiskBusType', 'bus': 'int', 'target': 'int', 'unit': 'int'} } =20 +## +# @GuestFsUsage: +# +# @used-bytes: file system used bytes +# @total-bytes: file system total bytes for nonroot user +# +# Since: 3.0 +## +{ 'struct': 'GuestFsUsage', + 'data': {'used-bytes': 'uint64', 'total-bytes': 'uint64'} } + ## # @GuestFilesystemInfo: # # @name: disk name # @mountpoint: mount point path # @type: file system type string +# @usage: file system usage struct (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 +865,7 @@ ## { 'struct': 'GuestFilesystemInfo', 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', - 'disk': ['GuestDiskAddress']} } + '*usage': 'GuestFsUsage', 'disk': ['GuestDiskAddress']} } =20 ## # @guest-get-fsinfo: --=20 2.17.0 From nobody Mon Feb 9 07:07:22 2026 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527867024645168.74604338144525; Fri, 1 Jun 2018 08:30:24 -0700 (PDT) Received: from localhost ([::1]:56211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOm0M-000721-Rj for importer@patchew.org; Fri, 01 Jun 2018 11:30:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOlz0-0006L1-U7 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOlyw-0006RD-EI for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:50 -0400 Received: from m15-112.126.com ([220.181.15.112]:45211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOlyv-0006Oa-50 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 11:28:46 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp2 (Coremail) with SMTP id DMmowADnHnPzZRFbvO1lCA--.38587S4; Fri, 01 Jun 2018 23:28:39 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=J7nTr5xxn+Y9Nk4hXC ebSdNgEG570iPqjRe4kIjJLCU=; b=DyGCQUWra41xhKGkYHzoUoxk7oORjob1Mz Gf1242jf6Dhn9Ugg96XDAPqaLCZq14NCmYW7zQA7WaIkVTcNWFWSZ7KzJ/rHdTzX ovxou/GZduVnCxeqGjQHS6LupUGepzrQhrz1H2m022HMEfrjpltag6SX6LFQiYna 85dwMX5oU= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Fri, 1 Jun 2018 23:27:46 +0800 Message-Id: <20180601152746.17169-3-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601152746.17169-1-chen_han_xiao@126.com> References: <20180601152746.17169-1-chen_han_xiao@126.com> X-CM-TRANSID: DMmowADnHnPzZRFbvO1lCA--.38587S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxJry7uw4rAw1kGF1UZF1DKFg_yoW8ArWrpr WrKr97K3ykJF1xtrnxCa1rZFy5G3Zak34UG393t34Fq3WkKF40q39Ikr95X39xWrs3Ar4r Arykt34agF1a9wUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzpBfUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbi4wdYrlpD5yYSMQAAsp X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.112 Subject: [Qemu-devel] [PATCH v5 2/2] qga-win: add driver path 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 windows driver path. The usage of fs stored as used_bytes and total_bytes. Cc: Michael Roth Signed-off-by: Chen Hanxiao --- qga/commands-win32.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 2d48394748..badcc2e2e8 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -670,7 +670,9 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *gu= id, Error **errp) char fs_name[32]; char vol_info[MAX_PATH+1]; size_t len; + uint64_t i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes; GuestFilesystemInfo *fs =3D NULL; + GuestFsUsage *usage =3D NULL; =20 GetVolumePathNamesForVolumeName(guid, (LPCH)&mnt, 0, &info_size); if (GetLastError() !=3D ERROR_MORE_DATA) { @@ -699,10 +701,21 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *= guid, Error **errp) fs_name[sizeof(fs_name) - 1] =3D 0; fs =3D g_malloc(sizeof(*fs)); fs->name =3D g_strdup(guid); + fs->has_usage =3D false; if (len =3D=3D 0) { fs->mountpoint =3D g_strdup("System Reserved"); } else { fs->mountpoint =3D g_strndup(mnt_point, len); + if (GetDiskFreeSpaceEx(fs->mountpoint, + (PULARGE_INTEGER) & i64FreeBytesToCaller, + (PULARGE_INTEGER) & i64TotalBytes, + (PULARGE_INTEGER) & i64FreeBytes)) { + usage =3D g_malloc(sizeof(*usage)); + usage->used_bytes =3D i64TotalBytes - i64FreeBytes; + usage->total_bytes =3D i64TotalBytes; + fs->usage =3D usage; + fs->has_usage =3D true; + } } fs->type =3D g_strdup(fs_name); fs->disk =3D build_guest_disk_info(guid, errp); --=20 2.17.0