[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/8] qga:/qga-win: skip getting pci info for USB disks
From: |
Konstantin Kostiuk |
Subject: |
[PULL 5/8] qga:/qga-win: skip getting pci info for USB disks |
Date: |
Fri, 16 Dec 2022 15:54:36 +0200 |
From: Kfir Manor <kfir@daynix.com>
Skip getting PCI info from disks type USB and give them an empty PCI address
instead.
Signed-off-by: Kfir Manor <kfir@daynix.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
qga/commands-win32.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index a645480496..14c43b3de5 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -878,10 +878,14 @@ static void get_single_disk_info(int disk_number,
* if that doesn't hold since that suggests some other unexpected
* breakage
*/
- disk->pci_controller = get_pci_info(disk_number, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- goto err_close;
+ if (disk->bus_type == GUEST_DISK_BUS_TYPE_USB) {
+ disk->pci_controller = get_empty_pci_address();
+ } else {
+ disk->pci_controller = get_pci_info(disk_number, &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
--
2.25.1
- [PULL 0/8] QEMU Guest Agent misc patches, Konstantin Kostiuk, 2022/12/16
- [PULL 1/8] qga: Move FS TRIM code to commands-linux.c, Konstantin Kostiuk, 2022/12/16
- [PULL 2/8] qga: Add ZFS TRIM support for FreeBSD, Konstantin Kostiuk, 2022/12/16
- [PULL 3/8] qga: Add initial OpenBSD and NetBSD support, Konstantin Kostiuk, 2022/12/16
- [PULL 4/8] qga:/qga-win: adding a empty PCI address creation function, Konstantin Kostiuk, 2022/12/16
- [PULL 5/8] qga:/qga-win: skip getting pci info for USB disks,
Konstantin Kostiuk <=
- [PULL 8/8] qga: map GLib log levels to system levels, Konstantin Kostiuk, 2022/12/16
- [PULL 6/8] qga-win: choose the right libpcre version to include in MSI package, Konstantin Kostiuk, 2022/12/16
- [PULL 7/8] qga-win: add logging to Windows event log, Konstantin Kostiuk, 2022/12/16
- Re: [PULL 0/8] QEMU Guest Agent misc patches, Peter Maydell, 2022/12/16