From: Magnus Kulke <[email protected]> The remaining MsiControl infrastructure can be removed now
Signed-off-by: Magnus Kulke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> --- include/system/mshv_int.h | 3 --- accel/mshv/irq.c | 11 ----------- accel/mshv/mshv-all.c | 2 -- 3 files changed, 16 deletions(-) diff --git a/include/system/mshv_int.h b/include/system/mshv_int.h index 68b84ce2c8d..5eef2e6e2cb 100644 --- a/include/system/mshv_int.h +++ b/include/system/mshv_int.h @@ -120,7 +120,4 @@ typedef struct MshvMsrEntries { int mshv_configure_msr(const CPUState *cpu, const MshvMsrEntry *msrs, size_t n_msrs); -/* interrupt */ -void mshv_init_msicontrol(void); - #endif diff --git a/accel/mshv/irq.c b/accel/mshv/irq.c index 52b8ac94790..4828ac51ac2 100644 --- a/accel/mshv/irq.c +++ b/accel/mshv/irq.c @@ -25,17 +25,6 @@ #define MSHV_IRQFD_RESAMPLE_FLAG (1 << MSHV_IRQFD_BIT_RESAMPLE) #define MSHV_IRQFD_BIT_DEASSIGN_FLAG (1 << MSHV_IRQFD_BIT_DEASSIGN) -static MshvMsiControl *msi_control; -static QemuMutex msi_control_mutex; - -void mshv_init_msicontrol(void) -{ - qemu_mutex_init(&msi_control_mutex); - msi_control = g_new0(MshvMsiControl, 1); - msi_control->gsi_routes = g_hash_table_new(g_direct_hash, g_direct_equal); - msi_control->updated = false; -} - /* Pass an eventfd which is to be used for injecting interrupts from userland */ static int irqfd(int vm_fd, int fd, int resample_fd, uint32_t gsi, uint32_t flags) diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c index 19a44bb13de..b06eea2a5e9 100644 --- a/accel/mshv/mshv-all.c +++ b/accel/mshv/mshv-all.c @@ -505,8 +505,6 @@ static int mshv_init(AccelState *as, MachineState *ms) mshv_init_mmio_emu(); - mshv_init_msicontrol(); - ret = create_vm(mshv_fd, &vm_fd); if (ret < 0) { close(mshv_fd); -- 2.54.0
