Skip to contentSkip to conversation

include/hw/hyperv: Remove unused 'struct mshv_vp_registers' definition

PATCH Applied Cédric Le Goater 2 participants 3 messages Jan 8 – Jan 13

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include/hw/hyperv: Remove unused 'struct mshv_vp_registers' definition

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.

---
 include/hw/hyperv/hvgdk_mini.h | 7 -------
 1 file changed, 7 deletions(-)
include/hw/hyperv/hvgdk_mini.h +0 -7
index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
@@ -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 {
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw

Thanks, looks good to me.

Quoted 33 lines · Cédric Le Goater

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.

---
 include/hw/hyperv/hvgdk_mini.h | 7 -------
 1 file changed, 7 deletions(-)
include/hw/hyperv/hvgdk_mini.h +0 -7
index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
@@ -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 {
Signature · 1 line
2.52.0
author Applied
#2 lore raw
In reply to Cédric Le Goater
Quoted 21 lines · Cédric Le Goater

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.

---
  include/hw/hyperv/hvgdk_mini.h | 7 -------
  1 file changed, 7 deletions(-)
include/hw/hyperv/hvgdk_mini.h +0 -0
index d89315f5452fd565469bbfc98cacb226b71da13f..cb52cc9de283bbe4201357127c2eb1b0b37e4cab 100644
@@ -450,13 +450,6 @@ typedef struct hv_input_set_vp_registers {
      struct hv_register_assoc elements[];
  } hv_input_set_vp_registers;
 

include/hw/hyperv/hvgdk_mini.h typedef struct hv_input_set_vp_registers { · line 455

Quoted 10 lines
include/hw/hyperv/hvgdk_mini.h +0 -7
-#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.