| Message ID | 20221110062329.13363-2-akihiko.odaki@daynix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | util: Introduce qemu_get_runtime_dir() | expand |
On Thu, Nov 10, 2022 at 8:25 AM Akihiko Odaki <akihiko.odaki@daynix.com> wrote: > GUID_DEVINTERFACE_DISK and GUID_DEVINTERFACE_STORAGEPORT are already > defined by MinGW-w64. They are not only unnecessary, but can lead to > duplicate definition errors at link time with some unknown condition. > What version of MinGW-w64 do you use? We have a compilation problem in CI and CentOS Stream without this. > > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > qga/commands-win32.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index ec9f55b453..dde5d401bb 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -506,13 +506,6 @@ static GuestDiskBusType > find_bus_type(STORAGE_BUS_TYPE bus) > return win2qemu[(int)bus]; > } > > -DEFINE_GUID(GUID_DEVINTERFACE_DISK, > - 0x53f56307L, 0xb6bf, 0x11d0, 0x94, 0xf2, > - 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); > -DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT, > - 0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, > - 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); > - > static void get_pci_address_for_device(GuestPCIAddress *pci, > HDEVINFO dev_info) > { > -- > 2.38.1 > >
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ec9f55b453..dde5d401bb 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -506,13 +506,6 @@ static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus) return win2qemu[(int)bus]; } -DEFINE_GUID(GUID_DEVINTERFACE_DISK, - 0x53f56307L, 0xb6bf, 0x11d0, 0x94, 0xf2, - 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); -DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT, - 0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, - 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - static void get_pci_address_for_device(GuestPCIAddress *pci, HDEVINFO dev_info) {
GUID_DEVINTERFACE_DISK and GUID_DEVINTERFACE_STORAGEPORT are already defined by MinGW-w64. They are not only unnecessary, but can lead to duplicate definition errors at link time with some unknown condition. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- qga/commands-win32.c | 7 ------- 1 file changed, 7 deletions(-)