[5.19.0-next-20220811] Build failure drivers/vdpa

[Sachin Sant]

5.19.0-next-20220811 linux-next fails to build on IBM Power with 
following error:

drivers/vdpa/vdpa_sim/vdpa_sim_blk.c: In function 'vdpasim_blk_handle_req':
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c:201:3: error: a label can only be part of a statement and a declaration is not a statement
   struct virtio_blk_discard_write_zeroes range;
   ^~~~~~
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c:202:3: error: expected expression before 'u32'
   u32 num_sectors, flags;
   ^~~
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c:224:3: error: 'num_sectors' undeclared (first use in this function); did you mean 'bio_sectors'?
   num_sectors = vdpasim32_to_cpu(vdpasim, range.num_sectors);
   ^~~~~~~~~~~
   bio_sectors
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c:224:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c:225:3: error: 'flags' undeclared (first use in this function); did you mean 'class'?
   flags = vdpasim32_to_cpu(vdpasim, range.flags);
   ^~~~~
   class
make[3]: *** [scripts/Makefile.build:250: drivers/vdpa/vdpa_sim/vdpa_sim_blk.o] Error 1
make[2]: *** [scripts/Makefile.build:525: drivers/vdpa/vdpa_sim] Error 2
make[1]: *** [scripts/Makefile.build:525: drivers/vdpa] Error 2
make[1]: *** Waiting for unfinished jobs….

Git bisect points to the following patch

commit d79b32c2e4a4e66d5678410cd45815c1c2375196
Date:   Wed Aug 10 11:43:47 2022 +0200
    vdpa_sim_blk: add support for discard and write-zeroes

Thanks
- Sachin