From patchwork Thu May 31 02:19:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Hanxiao X-Patchwork-Id: 923107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="N/0RVN3x"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40xB531jPLz9s08 for ; Thu, 31 May 2018 12:20:21 +1000 (AEST) Received: from localhost ([::1]:41584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fODCL-0008SK-Vc for incoming@patchwork.ozlabs.org; Wed, 30 May 2018 22:20:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fODC3-0008SF-Ew for qemu-devel@nongnu.org; Wed, 30 May 2018 22:20:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fODC0-0003jw-8L for qemu-devel@nongnu.org; Wed, 30 May 2018 22:19:59 -0400 Received: from m15-111.126.com ([220.181.15.111]:54021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fODBz-0003Xk-EP for qemu-devel@nongnu.org; Wed, 30 May 2018 22:19:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=P390fzekQuKvp3IAV0 e6qWhG13zUWsI/9v09cJ7hlFU=; b=N/0RVN3xx5TMq0NO1EtRXQcnWEiz6cuyl4 I5GikG+iIJJRJ0Bb/2hh+BxgOrmcTL9uMrsqBP2DPfvUEfF50LmXIv6YtiA2zLFa a+2iYyZ5iaMtJXWqbUK81wAgWEpOo0uT+JL/l0iNdZ4VEH6LSIEDrQMtU0C9SAmm /MwgRWstQ= Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp1 (Coremail) with SMTP id C8mowADX0bStWw9bU2v1Bw--.32003S2; Thu, 31 May 2018 10:19:46 +0800 (CST) From: Chen Hanxiao To: qemu-devel@nongnu.org Date: Thu, 31 May 2018 10:19:24 +0800 Message-Id: <20180531021924.4836-1-chen_han_xiao@126.com> X-Mailer: git-send-email 2.17.0 X-CM-TRANSID: C8mowADX0bStWw9bU2v1Bw--.32003S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7uFyxCry7Kr13GFy7Xw4rGrg_yoW5JF1Upa 1Yy3WFyrW8JF97GrsxAF17tryrtanIkry0g3srX3yYvFyUJFyIg3ZF9a4kZw13ZrZ0ka1F vrW0q3W2gw47CwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jrjjDUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbiFgJXrlpD5uPg7AAAs9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.15.111 Subject: [Qemu-devel] [PATCH v3] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. qga/commands-posix.c | 16 ++++++++++++++++ qga/qapi-schema.json | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0dc219dbcf..7601978a11 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -46,6 +46,7 @@ extern char **environ; #include #include #include +#include #ifdef FIFREEZE #define CONFIG_FSFREEZE @@ -1072,6 +1073,9 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct FsMount *mount, Error **errp) { GuestFilesystemInfo *fs = g_malloc0(sizeof(*fs)); + struct statvfs buf; + unsigned long used, nonroot_total; + double usage; char *devpath = g_strdup_printf("/sys/dev/block/%u:%u", mount->devmajor, mount->devminor); @@ -1079,7 +1083,19 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct FsMount *mount, fs->type = g_strdup(mount->devtype); build_guest_fsinfo_for_device(devpath, fs, errp); + if (statvfs(fs->mountpoint, &buf)) { + error_setg_errno(errp, errno, "Failed to get statvfs"); + return NULL; + } + + used = buf.f_blocks - buf.f_bfree; + nonroot_total = used + buf.f_bavail; + usage = (double) used / nonroot_total; + + fs->usage = usage; + g_free(devpath); + return fs; } diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 17884c7c70..68b9f60824 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, 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 # # Since: 2.2 ## { 'struct': 'GuestFilesystemInfo', - 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', + 'data': {'name': 'str', 'mountpoint': 'str', 'type': 'str', 'usage': 'number', 'disk': ['GuestDiskAddress']} } ##