Hi
On Thu, Oct 4, 2018 at 3:22 PM Tomáš Golembiovský <tgole...@redhat.com> wrote:
>
> It was not obvious what exactly the cryptic string copying does to the
> GUID. This change makes the intent clearer.
>
> Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> qga/commands-win32.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index d0d969d0ce..82881aa749 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -507,7 +507,14 @@ static GuestPCIAddress *get_pci_info(char *guid, Error
> **errp)
> char dev_name[MAX_PATH];
> char *buffer = NULL;
> GuestPCIAddress *pci = NULL;
> - char *name = g_strdup(&guid[4]);
> + char *name = NULL;
> +
> + if ((g_str_has_prefix(guid, "\\\\.\\") == TRUE) ||
> + (g_str_has_prefix(guid, "\\\\?\\") == TRUE)) {
> + name = g_strdup(&guid[4]);
I find "guid + 4" easier to read though
> + } else {
> + name = g_strdup(guid);
> + }
>
> if (!QueryDosDevice(name, dev_name, ARRAY_SIZE(dev_name))) {
> error_setg_win32(errp, GetLastError(), "failed to get dos device
> name");
> --
> 2.19.0
>
