[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 11/14] qga-win: refactor disk info
From: |
Tomáš Golembiovský |
Subject: |
[Qemu-devel] [PATCH v5 11/14] qga-win: refactor disk info |
Date: |
Tue, 23 Oct 2018 13:23:20 +0200 |
Refactor building of disk info into a function that builds the list and
a function that returns infor for single disk. This will be used in
future commit that will handle multi-disk volumes.
Signed-off-by: Tomáš Golembiovský <address@hidden>
---
qga/commands-win32.c | 58 ++++++++++++++++++++++++++++++--------------
1 file changed, 40 insertions(+), 18 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index e7d9cdea62..bb9bf0218a 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -637,20 +637,15 @@ out_free:
return;
}
-/* VSS provider works with volumes, thus there is no difference if
- * the volume consist of spanned disks. Info about the first disk in the
- * volume is returned for the spanned disk group (LVM) */
-static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
+static void get_single_disk_info(char *name, GuestDiskAddress *disk,
+ Error **errp)
{
- GuestDiskAddressList *list = NULL;
- GuestDiskAddress *disk;
SCSI_ADDRESS addr, *scsi_ad;
DWORD len;
HANDLE vol_h;
Error *local_err = NULL;
scsi_ad = &addr;
- char *name = g_strndup(guid, strlen(guid)-1);
g_debug("getting disk info for: %s", name);
vol_h = CreateFile(name, 0, FILE_SHARE_READ, NULL, OPEN_EXISTING,
@@ -660,7 +655,6 @@ static GuestDiskAddressList *build_guest_disk_info(char
*guid, Error **errp)
goto err;
}
- disk = g_malloc0(sizeof(*disk));
get_disk_properties(vol_h, disk, &local_err);
if (local_err) {
error_propagate(errp, local_err);
@@ -671,7 +665,11 @@ static GuestDiskAddressList *build_guest_disk_info(char
*guid, Error **errp)
/* always set pci_controller as required by schema. get_pci_info() should
* report -1 values for non-PCI buses rather than fail.
*/
- disk->pci_controller = get_pci_info(name, errp);
+ disk->pci_controller = get_pci_info(name, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ goto err_close;
+ }
if (disk->bus_type == GUEST_DISK_BUS_TYPE_SCSI
|| disk->bus_type == GUEST_DISK_BUS_TYPE_IDE
|| disk->bus_type == GUEST_DISK_BUS_TYPE_RAID
@@ -694,20 +692,44 @@ static GuestDiskAddressList *build_guest_disk_info(char
*guid, Error **errp)
* information about volume. */
}
- list = g_malloc0(sizeof(*list));
- list->value = disk;
- list->next = NULL;
- CloseHandle(vol_h);
- g_free(name);
- return list;
-
err_close:
- g_free(disk);
CloseHandle(vol_h);
err:
+ return;
+}
+
+/* VSS provider works with volumes, thus there is no difference if
+ * the volume consist of spanned disks. Info about the first disk in the
+ * volume is returned for the spanned disk group (LVM) */
+static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
+{
+ Error *local_err = NULL;
+ GuestDiskAddressList *list = NULL, *cur_item = NULL;
+ GuestDiskAddress *disk = NULL;
+
+ /* strip final backslash */
+ char *name = g_strdup(guid);
+ if (g_str_has_suffix(name, "\\")) {
+ name[strlen(name) - 1] = 0;
+ }
+
+ disk = g_malloc0(sizeof(GuestDiskAddress));
+ get_single_disk_info(name, disk, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ goto out;
+ }
+
+ cur_item = g_malloc0(sizeof(*list));
+ cur_item->value = disk;
+ disk = NULL;
+ list = cur_item;
+
+out:
+ qapi_free_GuestDiskAddress(disk);
g_free(name);
- return NULL;
+ return list;
}
#else
--
2.19.0
- [Qemu-devel] [PATCH v5 00/14] qga: report serial number and disk node, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 02/14] qga: linux: report disk serial number, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 05/14] qga-win: fsinfo: pci-info: allow partial info, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 04/14] qga-win: prevent crash when executing fsinfo command, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 03/14] qga: linux: return disk device in guest-get-fsinfo, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 01/14] configure: add test for libudev, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 09/14] qga-win: refactor disk properties (bus), Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 06/14] *additonal fixup for NULL pci_controller field, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 11/14] qga-win: refactor disk info,
Tomáš Golembiovský <=
- [Qemu-devel] [PATCH v5 10/14] qga-win: report disk serial number, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 07/14] build: rename CONFIG_QGA_NTDDDISK to CONFIG_QGA_NTDDSCSI, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 08/14] qga-win: add debugging information, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 12/14] qga-win: handle multi-disk volumes, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 14/14] qga-win: demystify namespace stripping, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 13/14] qga-win: return disk device in guest-get-fsinfo, Tomáš Golembiovský, 2018/10/23
- Re: [Qemu-devel] [PATCH v5 00/14] qga: report serial number and disk node, Michael Roth, 2018/10/29