target/i386: remove unused pci-assign codes
PATCH 1/1 target/i386: remove unused pci-assign codes
Legacy PCI device assignment has been already removed in commit ab37bfc7d641 ("pci-assign: Remove"), but some codes remain unused.
Signed-off-by Eiichi Tsukata <[email protected]>
--- target/i386/kvm.c | 140 ----------------------------------------- target/i386/kvm_i386.h | 20 ------ 2 files changed, 160 deletions(-)
target/i386/kvm.c +0 -140
@@ -4505,146 +4505,6 @@ int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) } } -/* Classic KVM device assignment interface. Will remain x86 only. */ -int kvm_device_pci_assign (KVMState *s,PCIHostDeviceAddress *dev_addr, -uint32_t flags,uint32_t *dev_id) -{ -struct kvm_assigned_pci_dev dev_data = { - .segnr = dev_addr->domain, - .busnr = dev_addr->bus, - .devfn =PCI_DEVFN (dev_addr->slot, dev_addr->function), - .flags = flags, - }; -int ret; - - dev_data.assigned_dev_id = - (dev_addr->domain <<16 ) | (dev_addr->bus <<8 ) | dev_data.devfn; - - ret =kvm_vm_ioctl (s,KVM_ASSIGN_PCI_DEVICE , &dev_data); -if (ret <0 ) { -return ret; - } - - *dev_id = dev_data.assigned_dev_id; - -return 0 ; -} - -int kvm_device_pci_deassign (KVMState *s,uint32_t dev_id) -{ -struct kvm_assigned_pci_dev dev_data = { - .assigned_dev_id = dev_id, - }; - -return kvm_vm_ioctl (s,KVM_DEASSIGN_PCI_DEVICE , &dev_data); -} - -static int kvm_assign_irq_internal (KVMState *s,uint32_t dev_id, -uint32_t irq_type,uint32_t guest_irq) -{ -struct kvm_assigned_irq assigned_irq = { - .assigned_dev_id = dev_id, - .guest_irq = guest_irq, - .flags = irq_type, - }; - -if (kvm_check_extension (s,KVM_CAP_ASSIGN_DEV_IRQ )) { -return kvm_vm_ioctl (s,KVM_ASSIGN_DEV_IRQ , &assigned_irq); - }else { -return kvm_vm_ioctl (s,KVM_ASSIGN_IRQ , &assigned_irq); - } -} - -int kvm_device_intx_assign (KVMState *s,uint32_t dev_id,bool use_host_msi, -uint32_t guest_irq) -{ -uint32_t irq_type =KVM_DEV_IRQ_GUEST_INTX | - (use_host_msi ?KVM_DEV_IRQ_HOST_MSI :KVM_DEV_IRQ_HOST_INTX ); - -return kvm_assign_irq_internal (s, dev_id, irq_type, guest_irq); -} - -int kvm_device_intx_set_mask (KVMState *s,uint32_t dev_id,bool masked) -{ -struct kvm_assigned_pci_dev dev_data = { - .assigned_dev_id = dev_id, - .flags = masked ?KVM_DEV_ASSIGN_MASK_INTX :0 , - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_INTX_MASK , &dev_data); -} - -static int kvm_deassign_irq_internal (KVMState *s,uint32_t dev_id, -uint32_t type) -{ -struct kvm_assigned_irq assigned_irq = { - .assigned_dev_id = dev_id, - .flags = type, - }; - -return kvm_vm_ioctl (s,KVM_DEASSIGN_DEV_IRQ , &assigned_irq); -} - -int kvm_device_intx_deassign (KVMState *s,uint32_t dev_id,bool use_host_msi) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_INTX | - (use_host_msi ?KVM_DEV_IRQ_HOST_MSI :KVM_DEV_IRQ_HOST_INTX )); -} - -int kvm_device_msi_assign (KVMState *s,uint32_t dev_id,int virq) -{ -return kvm_assign_irq_internal (s, dev_id,KVM_DEV_IRQ_HOST_MSI | -KVM_DEV_IRQ_GUEST_MSI , virq); -} - -int kvm_device_msi_deassign (KVMState *s,uint32_t dev_id) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_MSI | -KVM_DEV_IRQ_HOST_MSI ); -} - -bool kvm_device_msix_supported (KVMState *s) -{ -/* The kernel lacks a corresponding KVM_CAP, so we probe by calling -* KVM_ASSIGN_SET_MSIX_NR with an invalid parameter. */ -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_NR ,NULL ) == -EFAULT ; -} - -int kvm_device_msix_init_vectors (KVMState *s,uint32_t dev_id, -uint32_t nr_vectors) -{ -struct kvm_assigned_msix_nr msix_nr = { - .assigned_dev_id = dev_id, - .entry_nr = nr_vectors, - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_NR , &msix_nr); -} - -int kvm_device_msix_set_vector (KVMState *s,uint32_t dev_id,uint32_t vector, -int virq) -{ -struct kvm_assigned_msix_entry msix_entry = { - .assigned_dev_id = dev_id, - .gsi = virq, - .entry = vector, - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_ENTRY , &msix_entry); -} - -int kvm_device_msix_assign (KVMState *s,uint32_t dev_id) -{ -return kvm_assign_irq_internal (s, dev_id,KVM_DEV_IRQ_HOST_MSIX | -KVM_DEV_IRQ_GUEST_MSIX ,0 ); -} - -int kvm_device_msix_deassign (KVMState *s,uint32_t dev_id) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_MSIX | -KVM_DEV_IRQ_HOST_MSIX ); -} -int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route,uint64_t address,uint32_t data,PCIDevice *dev) {
target/i386/kvm_i386.h +0 -20
@@ -40,26 +40,6 @@ void kvm_synchronize_all_tsc(void);void kvm_arch_reset_vcpu (X86CPU *cs);void kvm_arch_do_init_vcpu (X86CPU *cs); -int kvm_device_pci_assign (KVMState *s,PCIHostDeviceAddress *dev_addr, -uint32_t flags,uint32_t *dev_id); -int kvm_device_pci_deassign (KVMState *s,uint32_t dev_id); - -int kvm_device_intx_assign (KVMState *s,uint32_t dev_id, -bool use_host_msi,uint32_t guest_irq); -int kvm_device_intx_set_mask (KVMState *s,uint32_t dev_id,bool masked); -int kvm_device_intx_deassign (KVMState *s,uint32_t dev_id,bool use_host_msi); - -int kvm_device_msi_assign (KVMState *s,uint32_t dev_id,int virq); -int kvm_device_msi_deassign (KVMState *s,uint32_t dev_id); - -bool kvm_device_msix_supported (KVMState *s); -int kvm_device_msix_init_vectors (KVMState *s,uint32_t dev_id, -uint32_t nr_vectors); -int kvm_device_msix_set_vector (KVMState *s,uint32_t dev_id,uint32_t vector, -int virq); -int kvm_device_msix_assign (KVMState *s,uint32_t dev_id); -int kvm_device_msix_deassign (KVMState *s,uint32_t dev_id); -void kvm_put_apicbase (X86CPU *cpu,uint64_t value);bool kvm_enable_x2apic (void );
Signature · 1 line
2.23.0
Paolo Bonzini
AppliedQuoted 183 lines · Eiichi Tsukata
Legacy PCI device assignment has been already removed in commit
ab37bfc7d641("pci-assign: Remove"), but some codes remain unused.Signed-off-by Eiichi Tsukata <[email protected]>--- target/i386/kvm.c | 140 ----------------------------------------- target/i386/kvm_i386.h | 20 ------ 2 files changed, 160 deletions(-)target/i386/kvm.c +0
-140@@ -4505,146 +4505,6 @@ int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) } } -/* Classic KVM device assignment interface. Will remain x86 only. */ -int kvm_device_pci_assign (KVMState *s,PCIHostDeviceAddress *dev_addr, -uint32_t flags,uint32_t *dev_id) -{ -struct kvm_assigned_pci_dev dev_data = { - .segnr = dev_addr->domain, - .busnr = dev_addr->bus, - .devfn =PCI_DEVFN (dev_addr->slot, dev_addr->function), - .flags = flags, - }; -int ret; - - dev_data.assigned_dev_id = - (dev_addr->domain <<16 ) | (dev_addr->bus <<8 ) | dev_data.devfn; - - ret =kvm_vm_ioctl (s,KVM_ASSIGN_PCI_DEVICE , &dev_data); -if (ret <0 ) { -return ret; - } - - *dev_id = dev_data.assigned_dev_id; - -return 0 ; -} - -int kvm_device_pci_deassign (KVMState *s,uint32_t dev_id) -{ -struct kvm_assigned_pci_dev dev_data = { - .assigned_dev_id = dev_id, - }; - -return kvm_vm_ioctl (s,KVM_DEASSIGN_PCI_DEVICE , &dev_data); -} - -static int kvm_assign_irq_internal (KVMState *s,uint32_t dev_id, -uint32_t irq_type,uint32_t guest_irq) -{ -struct kvm_assigned_irq assigned_irq = { - .assigned_dev_id = dev_id, - .guest_irq = guest_irq, - .flags = irq_type, - }; - -if (kvm_check_extension (s,KVM_CAP_ASSIGN_DEV_IRQ )) { -return kvm_vm_ioctl (s,KVM_ASSIGN_DEV_IRQ , &assigned_irq); - }else { -return kvm_vm_ioctl (s,KVM_ASSIGN_IRQ , &assigned_irq); - } -} - -int kvm_device_intx_assign (KVMState *s,uint32_t dev_id,bool use_host_msi, -uint32_t guest_irq) -{ -uint32_t irq_type =KVM_DEV_IRQ_GUEST_INTX | - (use_host_msi ?KVM_DEV_IRQ_HOST_MSI :KVM_DEV_IRQ_HOST_INTX ); - -return kvm_assign_irq_internal (s, dev_id, irq_type, guest_irq); -} - -int kvm_device_intx_set_mask (KVMState *s,uint32_t dev_id,bool masked) -{ -struct kvm_assigned_pci_dev dev_data = { - .assigned_dev_id = dev_id, - .flags = masked ?KVM_DEV_ASSIGN_MASK_INTX :0 , - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_INTX_MASK , &dev_data); -} - -static int kvm_deassign_irq_internal (KVMState *s,uint32_t dev_id, -uint32_t type) -{ -struct kvm_assigned_irq assigned_irq = { - .assigned_dev_id = dev_id, - .flags = type, - }; - -return kvm_vm_ioctl (s,KVM_DEASSIGN_DEV_IRQ , &assigned_irq); -} - -int kvm_device_intx_deassign (KVMState *s,uint32_t dev_id,bool use_host_msi) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_INTX | - (use_host_msi ?KVM_DEV_IRQ_HOST_MSI :KVM_DEV_IRQ_HOST_INTX )); -} - -int kvm_device_msi_assign (KVMState *s,uint32_t dev_id,int virq) -{ -return kvm_assign_irq_internal (s, dev_id,KVM_DEV_IRQ_HOST_MSI | -KVM_DEV_IRQ_GUEST_MSI , virq); -} - -int kvm_device_msi_deassign (KVMState *s,uint32_t dev_id) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_MSI | -KVM_DEV_IRQ_HOST_MSI ); -} - -bool kvm_device_msix_supported (KVMState *s) -{ -/* The kernel lacks a corresponding KVM_CAP, so we probe by calling -* KVM_ASSIGN_SET_MSIX_NR with an invalid parameter. */ -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_NR ,NULL ) == -EFAULT ; -} - -int kvm_device_msix_init_vectors (KVMState *s,uint32_t dev_id, -uint32_t nr_vectors) -{ -struct kvm_assigned_msix_nr msix_nr = { - .assigned_dev_id = dev_id, - .entry_nr = nr_vectors, - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_NR , &msix_nr); -} - -int kvm_device_msix_set_vector (KVMState *s,uint32_t dev_id,uint32_t vector, -int virq) -{ -struct kvm_assigned_msix_entry msix_entry = { - .assigned_dev_id = dev_id, - .gsi = virq, - .entry = vector, - }; - -return kvm_vm_ioctl (s,KVM_ASSIGN_SET_MSIX_ENTRY , &msix_entry); -} - -int kvm_device_msix_assign (KVMState *s,uint32_t dev_id) -{ -return kvm_assign_irq_internal (s, dev_id,KVM_DEV_IRQ_HOST_MSIX | -KVM_DEV_IRQ_GUEST_MSIX ,0 ); -} - -int kvm_device_msix_deassign (KVMState *s,uint32_t dev_id) -{ -return kvm_deassign_irq_internal (s, dev_id,KVM_DEV_IRQ_GUEST_MSIX | -KVM_DEV_IRQ_HOST_MSIX ); -} -int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route,uint64_t address,uint32_t data,PCIDevice *dev) {target/i386/kvm_i386.h +0
-13@@ -40,26 +40,6 @@ void kvm_synchronize_all_tsc(void);void kvm_arch_reset_vcpu (X86CPU *cs);void kvm_arch_do_init_vcpu (X86CPU *cs); -int kvm_device_pci_assign (KVMState *s,PCIHostDeviceAddress *dev_addr, -uint32_t flags,uint32_t *dev_id); -int kvm_device_pci_deassign (KVMState *s,uint32_t dev_id); - -int kvm_device_intx_assign (KVMState *s,uint32_t dev_id, -bool use_host_msi,uint32_t guest_irq); -int kvm_device_intx_set_mask (KVMState *s,uint32_t dev_id,bool masked); -int kvm_device_intx_deassign (KVMState *s,uint32_t dev_id,bool use_host_msi); - -int kvm_device_msi_assign (KVMState *s,uint32_t dev_id,int virq); -int kvm_device_msi_deassign (KVMState *s,uint32_t dev_id); - -bool kvm_device_msix_supported (KVMState *s);
target/i386/kvm_i386.h void kvm_synchronize_all_tsc(void); · line 45
Quoted 10 lines
target/i386/kvm_i386.h +0
-7-int kvm_device_msix_init_vectors (KVMState *s,uint32_t dev_id, -uint32_t nr_vectors); -int kvm_device_msix_set_vector (KVMState *s,uint32_t dev_id,uint32_t vector, -int virq); -int kvm_device_msix_assign (KVMState *s,uint32_t dev_id); -int kvm_device_msix_deassign (KVMState *s,uint32_t dev_id); -void kvm_put_apicbase (X86CPU *cpu,uint64_t value);bool kvm_enable_x2apic (void );
Queued, thanks.