From patchwork Fri Jun 19 16:57:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 486814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 E15EA14010F for ; Sat, 20 Jun 2015 03:00:00 +1000 (AEST) Received: from localhost ([::1]:59247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5ze2-0003OM-Vc for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 12:59:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zYo-0001iN-I2 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 12:54:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5zYn-0003oK-Jt for qemu-devel@nongnu.org; Fri, 19 Jun 2015 12:54:34 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:33442 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zYn-0003n0-6p for qemu-devel@nongnu.org; Fri, 19 Jun 2015 12:54:33 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t5JGsEmk001868; Fri, 19 Jun 2015 19:54:25 +0300 (MSK) From: "Denis V. Lunev" To: Date: Fri, 19 Jun 2015 19:57:52 +0300 Message-Id: <1434733075-24240-8-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434733075-24240-1-git-send-email-den@openvz.org> References: <1434733075-24240-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Michael Roth , Olga Krishtal , qemu-devel@nongnu.org, "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 07/10] qga: added empty qmp_quest_get_fsinfo functionality. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Olga Krishtal We need qmp_quest_get_fsinfo togather with vss-provider, which works with volumes. The call to this function is implemented via FindFirst/NextVolumes. Moreover volumes in Windows OS are filesystem unit, so it will be more effective to work with them rather with devices. Signed-off-by: Olga Krishtal Signed-off-by: Denis V. Lunev CC: Eric Blake CC: Michael Roth --- qga/commands-win32.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index e633126..f484adc 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -769,10 +769,37 @@ done: return ge; } +static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) +{ + return NULL; +} + GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp) { - error_set(errp, QERR_UNSUPPORTED); - return NULL; + HANDLE vol_h; + GuestFilesystemInfoList *new, *ret = NULL; + char guid[256]; + bool res = false; + vol_h = FindFirstVolume(guid, sizeof(guid)); + if (vol_h == INVALID_HANDLE_VALUE) { + error_setg_win32(errp, GetLastError(), "failed to find any volume"); + return NULL; + } + + do { + new = g_malloc(sizeof(*ret)); + new->value = build_guest_fsinfo(guid, errp); + new->next = ret; + ret = new; + res = FindNextVolume(vol_h, guid, sizeof(guid)); + } while (GetLastError() != ERROR_NO_MORE_FILES && res); + + if (!res && GetLastError() != ERROR_NO_MORE_FILES) { + error_setg_win32(errp, GetLastError(), "failed to find next volume"); + } + + FindVolumeClose(vol_h); + return ret; } /* @@ -1099,7 +1126,7 @@ GList *ga_command_blacklist_init(GList *blacklist) "guest-set-user-password", "guest-get-memory-blocks", "guest-set-memory-blocks", "guest-get-memory-block-size", - "guest-fsfreeze-freeze-list", "guest-get-fsinfo", + "guest-fsfreeze-freeze-list", "guest-fstrim", NULL}; char **p = (char **)list_unsupported;