diff mbox series

[PULL,v2,16/24] qga-win: demystify namespace stripping

Message ID 20181031013821.24023-17-mdroth@linux.vnet.ibm.com
State New
Headers show
Series [PULL,v2,01/24] qga: Support Unicode paths in guest-file-open on win32 | expand

Commit Message

Michael Roth Oct. 31, 2018, 1:38 a.m. UTC 
From: Tomáš Golembiovský <tgolembi@redhat.com>

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ý <tgolembi@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/commands-win32.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 30d6c639c3..a1b7512d46 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -521,7 +521,7 @@  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;
     bool partial_pci = false;
     pci = g_malloc0(sizeof(*pci));
     pci->domain = -1;
@@ -529,6 +529,13 @@  static GuestPCIAddress *get_pci_info(char *guid, Error **errp)
     pci->function = -1;
     pci->bus = -1;
 
+    if (g_str_has_prefix(guid, "\\\\.\\") ||
+        g_str_has_prefix(guid, "\\\\?\\")) {
+        name = g_strdup(guid + 4);
+    } 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");
         goto out;