From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zYo-0001hv-By 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 1Z5zYm-0003n4-SA for qemu-devel@nongnu.org; Fri, 19 Jun 2015 12:54:34 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:37523 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zYm-0003mR-FW for qemu-devel@nongnu.org; Fri, 19 Jun 2015 12:54:32 -0400 From: "Denis V. Lunev" Date: Fri, 19 Jun 2015 19:57:53 +0300 Message-Id: <1434733075-24240-9-git-send-email-den@openvz.org> In-Reply-To: <1434733075-24240-1-git-send-email-den@openvz.org> References: <1434733075-24240-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 08/10] qga: added mountpoint and filesystem type for single volume List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Olga Krishtal , qemu-devel@nongnu.org, "Denis V. Lunev" From: Olga Krishtal We should use GetVolumeXXX api to work with volumes. This will help us to resolve the situation with volumes without drive letter, i.e. when the volume is mounted as a folder. Such volume is called mounted folder. This volume is a regular mounted volume from all other points of view. The information about non mounted volume is reported as System Reserved. This volume is not mounted and thus it is not writable. GuestDiskAddressList API is not used because operations are performed with volumes but no with disks. This means that spanned disk will be counted and handled as a single volume. It is worth mentioning that the information about every disk in the volume can be queried via IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS. Signed-off-by: Olga Krishtal Signed-off-by: Denis V. Lunev CC: Eric Blake CC: Michael Roth --- qga/commands-win32.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index f484adc..7acb258 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -771,7 +771,51 @@ done: static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) { - return NULL; + DWORD info_size; + char mnt, *mnt_point; + char fs_name[32]; + char vol_info[MAX_PATH+1]; + bool res; + size_t len; + DWORD err_code; + GuestFilesystemInfo *fs; + + GetVolumePathNamesForVolumeName(guid, (LPCH)&mnt, 0, + &info_size); + if (GetLastError() != ERROR_MORE_DATA) { + error_setg_win32(errp, GetLastError(), "failed to get volume name"); + return NULL; + } + + mnt_point = g_malloc0(sizeof(TCHAR)*info_size*2); + res = GetVolumePathNamesForVolumeName(guid, mnt_point, sizeof(mnt_point), + &info_size); + err_code = GetLastError(); + if (!res && err_code != ERROR_SUCCESS && err_code != ERROR_MORE_DATA) { + error_setg_win32(errp, GetLastError(), "failed ro get volume name"); + g_free(mnt_point); + return NULL; + } + len = strlen(mnt_point); + mnt_point[len] = '\\'; + if (!GetVolumeInformation(mnt_point, vol_info, sizeof(vol_info), NULL, NULL, + NULL, (LPSTR)&fs_name, sizeof(fs_name))) { + if (GetLastError() != ERROR_NOT_READY) { + error_setg_win32(errp, GetLastError(), "failed to get volume info"); + } + g_free(mnt_point); + return NULL; + } + + fs_name[sizeof(fs_name) - 1] = 0; + fs = g_malloc(sizeof(*fs)); + fs->name = g_strdup(guid); + fs->mountpoint = g_strndup(mnt_point, len); + fs->type = g_strdup(fs_name); + fs->disk = NULL; + g_free(mnt_point); + return fs; + } GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp) @@ -789,8 +833,12 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp) do { new = g_malloc(sizeof(*ret)); new->value = build_guest_fsinfo(guid, errp); - new->next = ret; - ret = new; + if (new->value != NULL) { + new->next = ret; + ret = new; + } else { + g_free(new); + } res = FindNextVolume(vol_h, guid, sizeof(guid)); } while (GetLastError() != ERROR_NO_MORE_FILES && res); -- 1.9.1