qga:/qga-win: adding a empty PCI address creation function
Refactoring code to avoid duplication of creating an empty PCI address code. 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>
This commit is contained in:
parent
33698d3abf
commit
8e12ec8ee3
|
@ -596,6 +596,18 @@ static void get_pci_address_for_device(GuestPCIAddress *pci,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static GuestPCIAddress *get_empty_pci_address(void)
|
||||||
|
{
|
||||||
|
GuestPCIAddress *pci = NULL;
|
||||||
|
|
||||||
|
pci = g_malloc0(sizeof(*pci));
|
||||||
|
pci->domain = -1;
|
||||||
|
pci->slot = -1;
|
||||||
|
pci->function = -1;
|
||||||
|
pci->bus = -1;
|
||||||
|
return pci;
|
||||||
|
}
|
||||||
|
|
||||||
static GuestPCIAddress *get_pci_info(int number, Error **errp)
|
static GuestPCIAddress *get_pci_info(int number, Error **errp)
|
||||||
{
|
{
|
||||||
HDEVINFO dev_info = INVALID_HANDLE_VALUE;
|
HDEVINFO dev_info = INVALID_HANDLE_VALUE;
|
||||||
|
@ -605,13 +617,7 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp)
|
||||||
SP_DEVICE_INTERFACE_DATA dev_iface_data;
|
SP_DEVICE_INTERFACE_DATA dev_iface_data;
|
||||||
HANDLE dev_file;
|
HANDLE dev_file;
|
||||||
int i;
|
int i;
|
||||||
GuestPCIAddress *pci = NULL;
|
GuestPCIAddress *pci = get_empty_pci_address();
|
||||||
|
|
||||||
pci = g_malloc0(sizeof(*pci));
|
|
||||||
pci->domain = -1;
|
|
||||||
pci->slot = -1;
|
|
||||||
pci->function = -1;
|
|
||||||
pci->bus = -1;
|
|
||||||
|
|
||||||
dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0,
|
dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0,
|
||||||
DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
|
DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
|
||||||
|
|
Loading…
Reference in New Issue