[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/14] *additonal fixup for NULL pci_controller f
From: |
Tomáš Golembiovský |
Subject: |
[Qemu-devel] [PATCH v5 06/14] *additonal fixup for NULL pci_controller field |
Date: |
Tue, 23 Oct 2018 13:23:15 +0200 |
From: Michael Roth <address@hidden>
(cherry picked from commit 51fe925a7b473c76e06b60ddb8a862c91901b290)
Signed-off-by: Michael Roth <address@hidden>
Signed-off-by: Tomáš Golembiovský <address@hidden>
---
qga/commands-win32.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index a8967abf06..44b6b1ce88 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -627,6 +627,10 @@ static GuestDiskAddressList *build_guest_disk_info(char
*guid, Error **errp)
disk = g_malloc0(sizeof(*disk));
disk->bus_type = find_bus_type(bus);
+ /* always set pci_controller as required by schema. get_pci_info() should
+ * report -1 values for non-PCI buses rather than fail.
+ */
+ disk->pci_controller = get_pci_info(name, errp);
if (bus == BusTypeScsi || bus == BusTypeAta || bus == BusTypeRAID
#if (_WIN32_WINNT >= 0x0600)
/* This bus type is not supported before Windows Server 2003 SP1 */
@@ -641,12 +645,9 @@ static GuestDiskAddressList *build_guest_disk_info(char
*guid, Error **errp)
disk->unit = addr.Lun;
disk->target = addr.TargetId;
disk->bus = addr.PathId;
- disk->pci_controller = get_pci_info(name, errp);
}
/* We do not set error in this case, because we still have enough
* information about volume. */
- } else {
- disk->pci_controller = NULL;
}
list = g_malloc0(sizeof(*list));
--
2.19.0
- [Qemu-devel] [PATCH v5 00/14] qga: report serial number and disk node, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 02/14] qga: linux: report disk serial number, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 05/14] qga-win: fsinfo: pci-info: allow partial info, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 04/14] qga-win: prevent crash when executing fsinfo command, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 03/14] qga: linux: return disk device in guest-get-fsinfo, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 01/14] configure: add test for libudev, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 09/14] qga-win: refactor disk properties (bus), Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 06/14] *additonal fixup for NULL pci_controller field,
Tomáš Golembiovský <=
- [Qemu-devel] [PATCH v5 11/14] qga-win: refactor disk info, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 10/14] qga-win: report disk serial number, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 07/14] build: rename CONFIG_QGA_NTDDDISK to CONFIG_QGA_NTDDSCSI, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 08/14] qga-win: add debugging information, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 12/14] qga-win: handle multi-disk volumes, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 14/14] qga-win: demystify namespace stripping, Tomáš Golembiovský, 2018/10/23
- [Qemu-devel] [PATCH v5 13/14] qga-win: return disk device in guest-get-fsinfo, Tomáš Golembiovský, 2018/10/23
- Re: [Qemu-devel] [PATCH v5 00/14] qga: report serial number and disk node, Michael Roth, 2018/10/29