| Message ID | 20221120140044.752503-2-kfir@daynix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu-ga-win: 'guest-get-fsinfo' command wont query storage devices of bus type USB | expand |
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> On Sun, Nov 20, 2022 at 4:09 PM Kfir Manor <kfir@daynix.com> wrote: > Refactoring code to avoid duplication of creating an empty PCI address > code. > > Signed-off-by: Kfir Manor <kfir@daynix.com> > --- > qga/commands-win32.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index ec9f55b453..a645480496 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -599,6 +599,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) > { > HDEVINFO dev_info = INVALID_HANDLE_VALUE; > @@ -608,13 +620,7 @@ static GuestPCIAddress *get_pci_info(int number, > Error **errp) > SP_DEVICE_INTERFACE_DATA dev_iface_data; > HANDLE dev_file; > int i; > - GuestPCIAddress *pci = NULL; > - > - pci = g_malloc0(sizeof(*pci)); > - pci->domain = -1; > - pci->slot = -1; > - pci->function = -1; > - pci->bus = -1; > + GuestPCIAddress *pci = get_empty_pci_address(); > > dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0, > DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); > -- > 2.38.1 > >
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ec9f55b453..a645480496 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -599,6 +599,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) { HDEVINFO dev_info = INVALID_HANDLE_VALUE; @@ -608,13 +620,7 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp) SP_DEVICE_INTERFACE_DATA dev_iface_data; HANDLE dev_file; int i; - GuestPCIAddress *pci = NULL; - - pci = g_malloc0(sizeof(*pci)); - pci->domain = -1; - pci->slot = -1; - pci->function = -1; - pci->bus = -1; + GuestPCIAddress *pci = get_empty_pci_address(); dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
Refactoring code to avoid duplication of creating an empty PCI address code. Signed-off-by: Kfir Manor <kfir@daynix.com> --- qga/commands-win32.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)