Re: [PULL 2/3] qga-win32: Add support for NVME but type

[Konstantin Kostiuk]

Hi Richard and Marc-André

I looked into the compilation problem and have 2 solutions:

1. We can add some conditions to the win2qemu definition and

skip NVME support when old mingw-headers are used.

2. We can bump the version of the Fedora docker image to 36 or 37

that is used for cross-compilation tests.

I think the second option is more valuable because we remove

pregenerated qga-vss.tlb file and now we can check VSS build only

at Fedora 37.

What do you think?

Best Regards,

Konstantin Kostiuk.

On Tue, May 24, 2022 at 12:26 PM Konstantin Kostiuk <kkostiuk@redhat.com> wrote:

Thanks for the report. I will think about how to fix the build with old mingw-headers.

BusTypeNvme and BusTypeSpaces were added to mingw-headers v 9.0.0

On Mon, May 23, 2022 at 11:55 PM Richard Henderson <richard.henderson@linaro.org> wrote:

On 5/23/22 12:41, Konstantin Kostiuk wrote:
> Bus type spaces (Indicates a storage spaces bus) is not
> supported, so return it as unknown.
>
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> Message-Id: <20220520201401.706630-1-kkostiuk@redhat.com" target="_blank">20220520201401.706630-1-kkostiuk@redhat.com>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> ---
>   qga/commands-win32.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index dcdeb76a68..36f94c0f9c 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -490,6 +490,11 @@ static GuestDiskBusType win2qemu[] = {
>   #if (_WIN32_WINNT >= 0x0601)
>       [BusTypeVirtual] = GUEST_DISK_BUS_TYPE_VIRTUAL,
>       [BusTypeFileBackedVirtual] = GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL,
> +    /*
> +     * BusTypeSpaces currently is not suported
> +     */
> +    [BusTypeSpaces] = GUEST_DISK_BUS_TYPE_UNKNOWN,
> +    [BusTypeNvme] = GUEST_DISK_BUS_TYPE_NVME,
>   #endif
>   };
>   

Build fails:

../qga/commands-win32.c:496:6: error: 'BusTypeSpaces' undeclared here (not in a function);
did you mean 'BusTypeSas'?
   496 |     [BusTypeSpaces] = GUEST_DISK_BUS_TYPE_UNKNOWN,
       |      ^~~~~~~~~~~~~
       |      BusTypeSas
../qga/commands-win32.c:496:6: error: array index in initializer not of integer type
../qga/commands-win32.c:496:6: note: (near initialization for 'win2qemu')
../qga/commands-win32.c:497:6: error: 'BusTypeNvme' undeclared here (not in a function);
did you mean 'BusTypeMmc'?
   497 |     [BusTypeNvme] = GUEST_DISK_BUS_TYPE_NVME,
       |      ^~~~~~~~~~~
       |      BusTypeMmc
../qga/commands-win32.c:497:6: error: array index in initializer not of integer type
../qga/commands-win32.c:497:6: note: (near initialization for 'win2qemu')
 

r~