Re: [PATCH kvmtool 1/8] Sync-up headers with Linux-6.4-rc1

Will Deacon
2023-06-05T12:12:31Z

On Wed, May 10, 2023 at 02:07:41PM +0530, Anup Patel wrote:
> We sync-up Linux headers to get latest KVM RISC-V headers having
> SBI extension enable/disable, Zbb, Zicboz, and Ssaia support.
>
> Signed-off-by: Anup Patel <apatel@ventanamicro.com>
> ---
> arm/aarch64/include/asm/kvm.h | 38 ++++++++++++
> include/linux/kvm.h | 57 +++++++++++-------
> include/linux/virtio_blk.h | 105 ++++++++++++++++++++++++++++++++++
> include/linux/virtio_config.h | 6 ++
> include/linux/virtio_net.h | 5 ++
> riscv/include/asm/kvm.h | 56 +++++++++++++++++-
> x86/include/asm/kvm.h | 50 ++++++++++++----
> 7 files changed, 286 insertions(+), 31 deletions(-)

This breaks the build for x86:

Makefile:386: Skipping optional libraries: vncserver SDL
CC builtin-balloon.o
In file included from include/linux/kvm.h:15,
from include/kvm/pci.h:5,
from include/kvm/vfio.h:6,
from include/kvm/kvm-config.h:5,
from include/kvm/kvm.h:6,
from builtin-balloon.c:9:
x86/include/asm/kvm.h:511:17: error: expected specifier-qualifier-list before ‘__DECLARE_FLEX_ARRAY’
511 | __DECLARE_FLEX_ARRAY(struct kvm_vmx_nested_state_data, vmx);
| ^~~~~~~~~~~~~~~~~~~~
make: *** [Makefile:508: builtin-balloon.o] Error 1

Will