From nobody Sun May 5 05:35:22 2024 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 1528963703997715.3040798225495; Thu, 14 Jun 2018 01:08:23 -0700 (PDT) Received: from localhost ([::1]:39120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNIj-0004BW-F4 for importer@patchew.org; Thu, 14 Jun 2018 04:08:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNH7-0003Mb-Ra for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTNH5-0001Ji-C8 for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:33 -0400 Received: from m15-111.126.com ([220.181.15.111]:38878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNH4-0001HE-Jp for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:31 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp1 (Coremail) with SMTP id C8mowADnUSD0ISJbV4SIAQ--.22123S3; Thu, 14 Jun 2018 16:06:23 +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=r28Rs kfdRHzNj6yJkLKX2IYTuOc0G/uY60V5WutpQQ4=; b=oSkWZk9UuZSBedPzAgG9K G0DmNLbQ1zGn+eYxAbRqCyT7xA6VxmpeEKk6Krwz/nIe/TCN28Ype95eB/RogJki +6wDrABy7Nfs4Z2Ut5NI9B/kuVZuXctJR08VBMWyeNeG4gpNyYONqYMuv9mF7O+x cAzVwgJymLFUXk6msgOrNk= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Thu, 14 Jun 2018 16:06:06 +0800 Message-Id: <20180614080607.16604-2-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180614080607.16604-1-chen_han_xiao@126.com> References: <20180614080607.16604-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: C8mowADnUSD0ISJbV4SIAQ--.22123S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxWF18Gw4fCw15Cw13ur43GFg_yoW5WrW7pF 45A3WrKrW8JFn7JrsxC3W2vryFqanayryUW3y2q34YvFyDKrWS9wnI9a4v93sxu39YkF4F v3y8tw129w47ArUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jxiSdUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbiaB9lrlpD54JB5wAAsm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.111 Subject: [Qemu-devel] [PATCH v5.2 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: Daniel P. Berrang=C3=A9 Reviewed-by: 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 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 v5.2: remove useless assigments and fix doc 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 eae817191b..e0e7993bcf 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,19 @@ 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) =3D=3D 0) { + 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..b1bbb78c59 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: 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 # @@ -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.1 From nobody Sun May 5 05:35:22 2024 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 1528963703699750.9078926285714; Thu, 14 Jun 2018 01:08:23 -0700 (PDT) Received: from localhost ([::1]:39121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNIq-0004Hg-Rl for importer@patchew.org; Thu, 14 Jun 2018 04:08:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNHA-0003My-DH for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTNH4-0001J0-Nq for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:36 -0400 Received: from m15-111.126.com ([220.181.15.111]:38867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTNH3-0001Gz-Ua for qemu-devel@nongnu.org; Thu, 14 Jun 2018 04:06:30 -0400 Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp1 (Coremail) with SMTP id C8mowADnUSD0ISJbV4SIAQ--.22123S4; Thu, 14 Jun 2018 16:06:23 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=jD5J3U8ObLrMZFIZzo iDHFvYgFicKFk5xrhnB7JpWXE=; b=llgFGxeDTrggBplPm6PAEqH899uLAQl+Ao 7iMDCn0SYTJjTaQrxSzuR4wiZOadznoP8OnTDHTYfMTLdv2Wk+Ea/ubeWlYL4WJe rlgFv/YHoV7cA1u9n4JfD77Diu2S1aLuNeS+1oVowFxQM2ooji75M/m4d0r7ro4h BdwvEv3EY= From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Thu, 14 Jun 2018 16:06:07 +0800 Message-Id: <20180614080607.16604-3-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180614080607.16604-1-chen_han_xiao@126.com> References: <20180614080607.16604-1-chen_han_xiao@126.com> X-CM-TRANSID: C8mowADnUSD0ISJbV4SIAQ--.22123S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxJryxXF17Xw43KFy8Gr1Utrb_yoW8Ar4kpr W5Jr9xK3ykJF12qrnxCF4rZF1rJF9Yy34UG393tryYvw1kKF40qwnIkryvqwn5Wws3Ar4r Z34kt342gF1avwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jcyCXUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbitQNlrlpD5582RAAAsu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.111 Subject: [Qemu-devel] [PATCH v5.2 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 70ee5379f6..0103c0695c 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.1