From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Tomáš Golembiovský" <tgolembi@redhat.com>,
"Yonggang Luo" <luoyonggang@gmail.com>
Cc: Thomas Huth <thuth@redhat.com>,
Michael Roth <mdroth@linux.vnet.ibm.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v2 3/3] qga: add implementation of guest-get-disks for Windows
Date: Mon, 7 Sep 2020 11:31:16 +0200 [thread overview]
Message-ID: <bc08b17b-695e-b5d0-a616-c9ae39d337c1@redhat.com> (raw)
In-Reply-To: <2cd59ce454e0da02eeb75ab7461ef420b30864f5.1599470071.git.tgolembi@redhat.com>
Cc'ing Yonggang Luo for review.
On 9/7/20 11:14 AM, Tomáš Golembiovský wrote:
> The command lists all the physical disk drives. Unlike for Linux
> partitions and virtual volumes are not listed.
>
> Example output:
>
> {
> "return": [
> {
> "name": "\\\\.\\PhysicalDrive0",
> "partition": false,
> "address": {
> "serial": "QM00001",
> "bus-type": "sata",
> ...
> },
> "slaves": []
> }
> ]
> }
>
> Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
> ---
> qga/commands-win32.c | 97 +++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 91 insertions(+), 6 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index e9976a0c46..9ac847a187 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -945,6 +945,91 @@ out:
> return list;
> }
>
> +GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
> +{
> + GuestDiskInfoList *new = NULL, *ret = NULL;
> + HDEVINFO dev_info;
> + SP_DEVICE_INTERFACE_DATA dev_iface_data;
> + int i;
> +
> + dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0,
> + DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
> + if (dev_info == INVALID_HANDLE_VALUE) {
> + error_setg_win32(errp, GetLastError(), "failed to get device tree");
> + return NULL;
> + }
> +
> + g_debug("enumerating devices");
> + dev_iface_data.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
> + for (i = 0;
> + SetupDiEnumDeviceInterfaces(dev_info, NULL, &GUID_DEVINTERFACE_DISK,
> + i, &dev_iface_data);
> + i++) {
> + GuestDiskAddress *address = NULL;
> + GuestDiskInfo *disk = NULL;
> + Error *local_err = NULL;
> + g_autofree PSP_DEVICE_INTERFACE_DETAIL_DATA
> + pdev_iface_detail_data = NULL;
> + STORAGE_DEVICE_NUMBER sdn;
> + HANDLE dev_file;
> + DWORD size = 0;
> +
> + g_debug(" getting device path");
> + while (!SetupDiGetDeviceInterfaceDetail(dev_info, &dev_iface_data,
> + pdev_iface_detail_data,
> + size, &size,
> + NULL)) {
> + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
> + pdev_iface_detail_data = g_malloc(size);
> + pdev_iface_detail_data->cbSize =
> + sizeof(*pdev_iface_detail_data);
> + } else {
> + g_debug("failed to get device interface details");
> + continue;
> + }
> + }
> +
> + g_debug(" device: %s", pdev_iface_detail_data->DevicePath);
> + dev_file = CreateFile(pdev_iface_detail_data->DevicePath, 0,
> + FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
> + if (!DeviceIoControl(dev_file, IOCTL_STORAGE_GET_DEVICE_NUMBER,
> + NULL, 0, &sdn, sizeof(sdn), &size, NULL)) {
> + CloseHandle(dev_file);
> + debug_error("failed to get storage device number");
> + continue;
> + }
> + CloseHandle(dev_file);
> +
> + disk = g_new0(GuestDiskInfo, 1);
> + disk->name = g_strdup_printf("\\\\.\\PhysicalDrive%lu",
> + sdn.DeviceNumber);
> +
> + g_debug(" number: %lu", sdn.DeviceNumber);
> + address = g_malloc0(sizeof(GuestDiskAddress));
> + address->has_dev = true;
> + address->dev = g_strdup(disk->name);
> + get_single_disk_info(sdn.DeviceNumber, address, &local_err);
> + if (local_err) {
> + g_debug("failed to get disk info: %s",
> + error_get_pretty(local_err));
> + error_free(local_err);
> + qapi_free_GuestDiskAddress(address);
> + address = NULL;
> + } else {
> + disk->address = address;
> + disk->has_address = true;
> + }
> +
> + new = g_malloc0(sizeof(GuestDiskInfoList));
> + new->value = disk;
> + new->next = ret;
> + ret = new;
> + }
> +
> + SetupDiDestroyDeviceInfoList(dev_info);
> + return ret;
> +}
> +
> #else
>
> static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
> @@ -952,6 +1037,12 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
> return NULL;
> }
>
> +GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
> +{
> + error_setg(errp, QERR_UNSUPPORTED);
> + return NULL;
> +}
> +
> #endif /* CONFIG_QGA_NTDDSCSI */
>
> static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
> @@ -2229,9 +2320,3 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp)
>
> return info;
> }
> -
> -GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
> -{
> - error_setg(errp, QERR_UNSUPPORTED);
> - return NULL;
> -}
>
next prev parent reply other threads:[~2020-09-07 9:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 9:14 [PATCH v2 0/3] qga: add command guest-get-disk Tomáš Golembiovský
2020-09-07 9:14 ` [PATCH v2 1/3] qga: add command guest-get-disks Tomáš Golembiovský
2020-09-07 9:32 ` Philippe Mathieu-Daudé
2020-09-29 15:22 ` Marc-André Lureau
2020-10-06 8:36 ` Daniel P. Berrangé
2020-10-06 13:53 ` Tomáš Golembiovský
2020-10-06 13:56 ` Daniel P. Berrangé
2020-09-07 9:14 ` [PATCH v2 2/3] qga: add implementation of guest-get-disks for Linux Tomáš Golembiovský
2020-09-29 15:22 ` Marc-André Lureau
2020-10-06 8:31 ` Tomáš Golembiovský
2020-10-06 8:40 ` Marc-André Lureau
2020-10-06 8:54 ` Daniel P. Berrangé
2020-09-07 9:14 ` [PATCH v2 3/3] qga: add implementation of guest-get-disks for Windows Tomáš Golembiovský
2020-09-07 9:31 ` Philippe Mathieu-Daudé [this message]
2020-09-29 15:31 ` Marc-André Lureau
2020-09-25 8:32 ` [PATCH v2 0/3] qga: add command guest-get-disk Tomáš Golembiovský
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bc08b17b-695e-b5d0-a616-c9ae39d337c1@redhat.com \
--to=philmd@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=tgolembi@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).