From nobody Mon Feb 9 09:18:13 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 1527872467236523.5877481488267; Fri, 1 Jun 2018 10:01:07 -0700 (PDT) Received: from localhost ([::1]:56762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnQB-0003wp-8P for importer@patchew.org; Fri, 01 Jun 2018 13:00:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnOE-0002hc-Ty for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:59:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOnOC-0002Jr-Dx for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:58:58 -0400 Received: from m15-114.126.com ([220.181.15.114]:50836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnOB-0002IR-Qq for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:58:56 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp7 (Coremail) with SMTP id DsmowAAnqpwQexFb6olpCA--.62045S3; Sat, 02 Jun 2018 00:58:50 +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=bW3cq XiOGjZZ0VjKatLo80kdrHlSLPE47/OK9bqn+44=; b=g00BGJl49bpcdVLNJLjjP OcDxB5MecJ7qSe9A5udIpmc9/ivjPQENuxAtbUfOHKJDYXDXPnyYACHMDImgQ3vQ TBrwJDYP5HOpcnSim0ZuHaUuz7sv3Tw4duBUUxi9i8vdaJuekYKs7XrStNS2WsSP j63nI9xeQeF8vNResq9p54= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Sat, 2 Jun 2018 00:57:49 +0800 Message-Id: <20180601165750.25420-2-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601165750.25420-1-chen_han_xiao@126.com> References: <20180601165750.25420-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: DsmowAAnqpwQexFb6olpCA--.62045S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxWF18GFWrtw4xtry7trykAFb_yoW5WF1fpF 45AF1rKrW8JFyxJrsxC3W7Zryrt3ZayryUW3y2q34YvFyDKrWF9wnIga4v9wn3uws5AF4F v3yktw12gw17Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jotC7UUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbi6wpYrlpD5ouS3wAAsu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.114 Subject: [Qemu-devel] [PATCH v5.1 1/2] qga: add mountpoint usage info 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 Reviewed-by: Eric Blake --- 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 qga/commands-posix.c | 18 ++++++++++++++++++ qga/qapi-schema.json | 3 +++ 2 files changed, 21 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0dc219dbcf..c60f10577e 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,8 @@ 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, fr_size; char *devpath =3D g_strdup_printf("/sys/dev/block/%u:%u", mount->devmajor, mount->devminor); =20 @@ -1079,7 +1082,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_total_bytes =3D false; + fs->has_used_bytes =3D false; + } else { + fr_size =3D buf.f_frsize; + used =3D buf.f_blocks - buf.f_bfree; + nonroot_total =3D used + buf.f_bavail; + fs->used_bytes =3D used * fr_size; + fs->total_bytes =3D nonroot_total * fr_size; + + fs->has_total_bytes =3D true; + fs->has_used_bytes =3D true; + } + g_free(devpath); + return fs; } =20 diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 17884c7c70..56ce2d08e2 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: nonroot 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']} } =20 ## --=20 2.17.0 From nobody Mon Feb 9 09:18:13 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 1527872597939865.6339818436711; Fri, 1 Jun 2018 10:03:17 -0700 (PDT) Received: from localhost ([::1]:56784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnSD-0005SY-7O for importer@patchew.org; Fri, 01 Jun 2018 13:03:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnOE-0002ha-U4 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:58:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOnOB-0002It-29 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:58:58 -0400 Received: from m15-114.126.com ([220.181.15.114]:50806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnOA-0002H2-D4 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:58:55 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp7 (Coremail) with SMTP id DsmowAAnqpwQexFb6olpCA--.62045S4; Sat, 02 Jun 2018 00:58:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=rDTaM20i5mlWd3DEKO wUdNI2ylGfhQRIOlySgPuhtI8=; b=nUkIy/RraNuJS0HmiDdRYdaJ6cWJE4ZZPr J0/g9ty+z43cJe3UaI1IaicEnDKtvCPfJjs0JSuH3iRypiPsW3ehsKLYEMPh6k8d a1ju3s2wFDs7UoLom75F7QSGbTpHJsShDAkzuRgujiPi1iQ0ibsE8ML7yzRBqT/l JunsLL60k= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Sat, 2 Jun 2018 00:57:50 +0800 Message-Id: <20180601165750.25420-3-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601165750.25420-1-chen_han_xiao@126.com> References: <20180601165750.25420-1-chen_han_xiao@126.com> X-CM-TRANSID: DsmowAAnqpwQexFb6olpCA--.62045S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxJryxGw4UCF1DZF1rur45Jrb_yoW8Ar4kpr W5Jr9rK3ykJF12qrnxGF4rZF1rJF9Yy34UG393tryYvF1kKF40qwnIkryvqwn5Wws3Ar4r Z34kt342gF1avwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jYhFxUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbiFgpYrlpD5vUPZwAAsI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.114 Subject: [Qemu-devel] [PATCH v5.1 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 --- v2: unpack usage as used-bytes and total-bytes qga/commands-win32.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 2d48394748..eff26c177e 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -670,6 +670,7 @@ 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; =20 GetVolumePathNamesForVolumeName(guid, (LPCH)&mnt, 0, &info_size); @@ -699,10 +700,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_total_bytes =3D false; + fs->has_used_bytes =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)) { + fs->used_bytes =3D i64TotalBytes - i64FreeBytes; + fs->total_bytes =3D i64TotalBytes; + fs->has_total_bytes =3D true; + fs->has_used_bytes =3D true; + } } fs->type =3D g_strdup(fs_name); fs->disk =3D build_guest_disk_info(guid, errp); --=20 2.17.0