diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2012-08-17 08:58:54 +0200 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 17:02:31 -0300 |
| commit | 0e6929389d245c27fe5c412b12c58ff58622681b (patch) | |
| tree | 42b9d1f00a8ac001fb500363d04c09c34f4b5e66 | |
| parent | 5704766c02e354b9de3b61fb5b5294bcb97b7a17 (diff) | |
qemu-kvm: Move kvm_device_intx_set_mask service
Move kvm_device_intx_set_mask prototype and implementation to their
upstream positions.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | qemu-kvm.c | 9 | ||||
| -rw-r--r-- | qemu-kvm.h | 2 | ||||
| -rw-r--r-- | target-i386/kvm.c | 9 | ||||
| -rw-r--r-- | target-i386/kvm_i386.h | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 8bc9857d1..8416a8d15 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -37,15 +37,6 @@ static int kvm_old_assign_irq(KVMState *s, return kvm_vm_ioctl(s, KVM_ASSIGN_IRQ, assigned_irq); } -int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked) -{ - struct kvm_assigned_pci_dev assigned_dev; - - assigned_dev.assigned_dev_id = dev_id; - assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0; - return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev); -} - #ifdef KVM_CAP_ASSIGN_DEV_IRQ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq) { diff --git a/qemu-kvm.h b/qemu-kvm.h index 1cdface87..c247ad09d 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -43,8 +43,6 @@ */ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq); -int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked); - struct kvm_irq_routing_entry; void kvm_add_routing_entry(KVMState *s, struct kvm_irq_routing_entry *entry); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fbdcee6db..94cac2df1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2116,6 +2116,15 @@ int kvm_device_intx_assign(KVMState *s, uint32_t dev_id, bool use_host_msi, 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 assigned_dev; + + assigned_dev.assigned_dev_id = dev_id; + assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0; + return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev); +} + static int kvm_deassign_irq_internal(KVMState *s, uint32_t dev_id, uint32_t type) { diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h index 5a241686c..28f26bbf7 100644 --- a/target-i386/kvm_i386.h +++ b/target-i386/kvm_i386.h @@ -21,6 +21,7 @@ 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_deassign(KVMState *s, uint32_t dev_id); |