The 'struct mshv_vp_registers' definition in hvgdk_mini.h is unused in
QEMU and conflicts with the canonical definition in
linux-headers/linux/mshv.h.

Remove the duplicate definition to avoid build conflicts when the Linux
headers are updated.

Cc: Magnus Kulke <magnuskulke@linux.microsoft.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 include/hw/hyperv/hvgdk_mini.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/hw/hyperv/hvgdk_mini.h b/include/hw/hyperv/hvgdk_mini.h
index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
--- a/include/hw/hyperv/hvgdk_mini.h
+++ b/include/hw/hyperv/hvgdk_mini.h
@@ -450,13 +450,6 @@ typedef struct hv_input_set_vp_registers {
     struct hv_register_assoc elements[];
 } hv_input_set_vp_registers;
 
-#define MSHV_VP_MAX_REGISTERS   128
-
-struct mshv_vp_registers {
-    int count; /* at most MSHV_VP_MAX_REGISTERS */
-    struct hv_register_assoc *regs;
-};
-
 union hv_interrupt_control {
     uint64_t as_uint64;
     struct {
-- 
2.52.0

On 1/8/26 19:50, Cédric Le Goater wrote:
> The 'struct mshv_vp_registers' definition in hvgdk_mini.h is unused in
> QEMU and conflicts with the canonical definition in
> linux-headers/linux/mshv.h.
> 
> Remove the duplicate definition to avoid build conflicts when the Linux
> headers are updated.
> 
> Cc: Magnus Kulke <magnuskulke@linux.microsoft.com>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   include/hw/hyperv/hvgdk_mini.h | 7 -------
>   1 file changed, 7 deletions(-)
> 
> diff --git a/include/hw/hyperv/hvgdk_mini.h b/include/hw/hyperv/hvgdk_mini.h
> index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
> --- a/include/hw/hyperv/hvgdk_mini.h
> +++ b/include/hw/hyperv/hvgdk_mini.h
> @@ -450,13 +450,6 @@ typedef struct hv_input_set_vp_registers {
>       struct hv_register_assoc elements[];
>   } hv_input_set_vp_registers;
>   
> -#define MSHV_VP_MAX_REGISTERS   128
> -
> -struct mshv_vp_registers {
> -    int count; /* at most MSHV_VP_MAX_REGISTERS */
> -    struct hv_register_assoc *regs;
> -};
> -
>   union hv_interrupt_control {
>       uint64_t as_uint64;
>       struct {

Applied to vfio-next.

Thanks,

C.

Reviewed-by: Magnus Kulke <magnuskulke@linux.microsoft.com>

Thanks, looks good to me.

On Thu, Jan 08, 2026 at 07:50:12PM +0100, Cédric Le Goater wrote:
> The 'struct mshv_vp_registers' definition in hvgdk_mini.h is unused in
> QEMU and conflicts with the canonical definition in
> linux-headers/linux/mshv.h.
> 
> Remove the duplicate definition to avoid build conflicts when the Linux
> headers are updated.
> 
> Cc: Magnus Kulke <magnuskulke@linux.microsoft.com>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>  include/hw/hyperv/hvgdk_mini.h | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/include/hw/hyperv/hvgdk_mini.h b/include/hw/hyperv/hvgdk_mini.h
> index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
> --- a/include/hw/hyperv/hvgdk_mini.h
> +++ b/include/hw/hyperv/hvgdk_mini.h
> @@ -450,13 +450,6 @@ typedef struct hv_input_set_vp_registers {
>      struct hv_register_assoc elements[];
>  } hv_input_set_vp_registers;
>  
> -#define MSHV_VP_MAX_REGISTERS   128
> -
> -struct mshv_vp_registers {
> -    int count; /* at most MSHV_VP_MAX_REGISTERS */
> -    struct hv_register_assoc *regs;
> -};
> -
>  union hv_interrupt_control {
>      uint64_t as_uint64;
>      struct {
> -- 
> 2.52.0