46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
|
From ab41162b50f176cd926104ee16c766c2186326a1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 20 Nov 2024 13:33:40 +0800
|
||
|
|
Subject: [PATCH] gqa-win: get_pci_info: Clean dev_info if handle is valid
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry picked from commit d0b896a7495b71313c43aff4329714ade56799d4
|
||
|
|
|
||
|
|
Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
|
||
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
qga/commands-win32.c | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
|
||
|
|
index 30e50f1769..d2ca36564d 100644
|
||
|
|
--- a/qga/commands-win32.c
|
||
|
|
+++ b/qga/commands-win32.c
|
||
|
|
@@ -514,7 +514,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT,
|
||
|
|
|
||
|
|
static GuestPCIAddress *get_pci_info(int number, Error **errp)
|
||
|
|
{
|
||
|
|
- HDEVINFO dev_info;
|
||
|
|
+ HDEVINFO dev_info = INVALID_HANDLE_VALUE;
|
||
|
|
SP_DEVINFO_DATA dev_info_data;
|
||
|
|
SP_DEVICE_INTERFACE_DATA dev_iface_data;
|
||
|
|
HANDLE dev_file;
|
||
|
|
@@ -749,7 +749,9 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp)
|
||
|
|
}
|
||
|
|
|
||
|
|
free_dev_info:
|
||
|
|
- SetupDiDestroyDeviceInfoList(dev_info);
|
||
|
|
+ if (dev_info != INVALID_HANDLE_VALUE) {
|
||
|
|
+ SetupDiDestroyDeviceInfoList(dev_info);
|
||
|
|
+ }
|
||
|
|
out:
|
||
|
|
return pci;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|