From patchwork Fri Jun 1 16:57:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen Hanxiao X-Patchwork-Id: 924231 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="g00BGJl4"; 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 40y9YB6WbNz9s1b for ; Sat, 2 Jun 2018 02:59:42 +1000 (AEST) Received: from localhost ([::1]:56752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOnOu-0002jc-HP for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:59:40 -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 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= 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) 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é 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 #ifdef FIFREEZE #define CONFIG_FSFREEZE @@ -1072,6 +1073,8 @@ static GuestFilesystemInfo *build_guest_fsinfo(struct FsMount *mount, Error **errp) { GuestFilesystemInfo *fs = g_malloc0(sizeof(*fs)); + struct statvfs buf; + unsigned long used, nonroot_total, fr_size; char *devpath = g_strdup_printf("/sys/dev/block/%u:%u", mount->devmajor, mount->devminor); @@ -1079,7 +1082,22 @@ 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)) { + fs->has_total_bytes = false; + fs->has_used_bytes = false; + } else { + fr_size = buf.f_frsize; + used = buf.f_blocks - buf.f_bfree; + nonroot_total = used + buf.f_bavail; + fs->used_bytes = used * fr_size; + fs->total_bytes = nonroot_total * fr_size; + + fs->has_total_bytes = true; + fs->has_used_bytes = true; + } + g_free(devpath); + return fs; } 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']} } ##