From: Glauber Costa <glom...@redhat.com> Start using kvm_vm_ioctl's code. For type safety, delete vm_fd from kvm_context entirely, so the compiler can play along with us helping to detect errors I might have made.
Also, we were slightly different from qemu upstream in handling error code from ioctl, since we were always testing for -1, while kvm_vm_ioctl returns -errno. We already did this in most of the call sites, so this patch has the big advantage of simplifying call sites. Diffstat says: 4 files changed, 58 insertions(+), 134 deletions(-) Signed-off-by: Glauber Costa <glom...@redhat.com> Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com> diff --git a/kvm-all.c b/kvm-all.c index 67908a7..9373d99 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -809,6 +809,7 @@ int kvm_ioctl(KVMState *s, int type, ...) return ret; } +#endif int kvm_vm_ioctl(KVMState *s, int type, ...) { @@ -827,6 +828,7 @@ int kvm_vm_ioctl(KVMState *s, int type, ...) return ret; } +#ifdef KVM_UPSTREAM int kvm_vcpu_ioctl(CPUState *env, int type, ...) { int ret; diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index d2c8abe..58ec1f2 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -40,10 +40,10 @@ int kvm_set_tss_addr(kvm_context_t kvm, unsigned long addr) r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_SET_TSS_ADDR); if (r > 0) { - r = ioctl(kvm->vm_fd, KVM_SET_TSS_ADDR, addr); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_SET_TSS_ADDR, addr); + if (r < 0) { fprintf(stderr, "kvm_set_tss_addr: %m\n"); - return -errno; + return r; } return 0; } @@ -80,7 +80,7 @@ static int kvm_set_identity_map_addr(kvm_context_t kvm, unsigned long addr) r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_SET_IDENTITY_MAP_ADDR); if (r > 0) { - r = ioctl(kvm->vm_fd, KVM_SET_IDENTITY_MAP_ADDR, &addr); + r = kvm_vm_ioctl(kvm_state, KVM_SET_IDENTITY_MAP_ADDR, &addr); if (r == -1) { fprintf(stderr, "kvm_set_identity_map_addr: %m\n"); return -errno; @@ -123,7 +123,7 @@ static int kvm_create_pit(kvm_context_t kvm) if (!kvm->no_pit_creation) { r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_PIT); if (r > 0) { - r = ioctl(kvm->vm_fd, KVM_CREATE_PIT); + r = kvm_vm_ioctl(kvm_state, KVM_CREATE_PIT); if (r >= 0) kvm->pit_in_kernel = 1; else { @@ -256,7 +256,6 @@ int kvm_create_memory_alias(kvm_context_t kvm, .memory_size = len, .target_phys_addr = target_phys, }; - int fd = kvm->vm_fd; int r; int slot; @@ -267,7 +266,7 @@ int kvm_create_memory_alias(kvm_context_t kvm, return -EBUSY; alias.slot = slot; - r = ioctl(fd, KVM_SET_MEMORY_ALIAS, &alias); + r = kvm_vm_ioctl(kvm_state, KVM_SET_MEMORY_ALIAS, &alias); if (r == -1) return -errno; @@ -314,55 +313,31 @@ int kvm_set_lapic(kvm_vcpu_context_t vcpu, struct kvm_lapic_state *s) int kvm_get_pit(kvm_context_t kvm, struct kvm_pit_state *s) { - int r; if (!kvm->pit_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_GET_PIT, s); - if (r == -1) { - r = -errno; - perror("kvm_get_pit"); - } - return r; + return kvm_vm_ioctl(kvm_state, KVM_GET_PIT, s); } int kvm_set_pit(kvm_context_t kvm, struct kvm_pit_state *s) { - int r; if (!kvm->pit_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_SET_PIT, s); - if (r == -1) { - r = -errno; - perror("kvm_set_pit"); - } - return r; + return kvm_vm_ioctl(kvm_state, KVM_SET_PIT, s); } #ifdef KVM_CAP_PIT_STATE2 int kvm_get_pit2(kvm_context_t kvm, struct kvm_pit_state2 *ps2) { - int r; if (!kvm->pit_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_GET_PIT2, ps2); - if (r == -1) { - r = -errno; - perror("kvm_get_pit2"); - } - return r; + return kvm_vm_ioctl(kvm_state, KVM_GET_PIT2, ps2); } int kvm_set_pit2(kvm_context_t kvm, struct kvm_pit_state2 *ps2) { - int r; if (!kvm->pit_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_SET_PIT2, ps2); - if (r == -1) { - r = -errno; - perror("kvm_set_pit2"); - } - return r; + return kvm_vm_ioctl(kvm_state, KVM_SET_PIT2, ps2); } #endif @@ -627,10 +602,10 @@ int kvm_set_shadow_pages(kvm_context_t kvm, unsigned int nrshadow_pages) r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_MMU_SHADOW_CACHE_CONTROL); if (r > 0) { - r = ioctl(kvm->vm_fd, KVM_SET_NR_MMU_PAGES, nrshadow_pages); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_SET_NR_MMU_PAGES, nrshadow_pages); + if (r < 0) { fprintf(stderr, "kvm_set_shadow_pages: %m\n"); - return -errno; + return r; } return 0; } @@ -646,7 +621,7 @@ int kvm_get_shadow_pages(kvm_context_t kvm, unsigned int *nrshadow_pages) r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_MMU_SHADOW_CACHE_CONTROL); if (r > 0) { - *nrshadow_pages = ioctl(kvm->vm_fd, KVM_GET_NR_MMU_PAGES); + *nrshadow_pages = kvm_vm_ioctl(kvm_state, KVM_GET_NR_MMU_PAGES); return 0; } #endif diff --git a/qemu-kvm.c b/qemu-kvm.c index 2484bd9..e90681f 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -44,7 +44,7 @@ int kvm_pit_reinject = 1; int kvm_nested = 0; -static KVMState *kvm_state; +KVMState *kvm_state; kvm_context_t kvm_context; pthread_mutex_t qemu_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -332,8 +332,8 @@ static int kvm_dirty_pages_log_change(kvm_context_t kvm, mem.guest_phys_addr, mem.memory_size, mem.flags); - r = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &mem); - if (r == -1) + r = kvm_vm_ioctl(kvm_state, KVM_SET_USER_MEMORY_REGION, &mem); + if (r < 0) fprintf(stderr, "%s: %m\n", __FUNCTION__); } return r; @@ -452,7 +452,7 @@ int kvm_init(int smp_cpus) kvm_context = &kvm_state->kvm_context; kvm_context->fd = fd; - kvm_context->vm_fd = -1; + kvm_state->vmfd = -1; kvm_context->opaque = cpu_single_env; kvm_context->dirty_pages_log_all = 0; kvm_context->no_irqchip_creation = 0; @@ -516,8 +516,8 @@ kvm_vcpu_context_t kvm_create_vcpu(CPUState *env, int id) vcpu_ctx->kvm = kvm; vcpu_ctx->id = id; - r = ioctl(kvm->vm_fd, KVM_CREATE_VCPU, id); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_CREATE_VCPU, id); + if (r < 0) { fprintf(stderr, "kvm_create_vcpu: %m\n"); goto err; } @@ -550,7 +550,7 @@ static int kvm_set_boot_vcpu_id(kvm_context_t kvm, uint32_t id) #ifdef KVM_CAP_SET_BOOT_CPU_ID int r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_SET_BOOT_CPU_ID); if (r > 0) - return ioctl(kvm->vm_fd, KVM_SET_BOOT_CPU_ID, id); + return kvm_vm_ioctl(kvm_state, KVM_SET_BOOT_CPU_ID, id); return -ENOSYS; #else return -ENOSYS; @@ -571,7 +571,7 @@ int kvm_create_vm(kvm_context_t kvm) fprintf(stderr, "kvm_create_vm: %m\n"); return -1; } - kvm->vm_fd = fd; + kvm_state->vmfd = fd; return 0; } @@ -609,7 +609,7 @@ void kvm_create_irqchip(kvm_context_t kvm) if (!kvm->no_irqchip_creation) { r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_IRQCHIP); if (r > 0) { /* kernel irqchip supported */ - r = ioctl(kvm->vm_fd, KVM_CREATE_IRQCHIP); + r = kvm_vm_ioctl(kvm_state, KVM_CREATE_IRQCHIP); if (r >= 0) { kvm->irqchip_inject_ioctl = KVM_IRQ_LINE; #if defined(KVM_CAP_IRQ_INJECT_STATUS) && defined(KVM_IRQ_LINE_STATUS) @@ -664,9 +664,9 @@ int kvm_register_phys_mem(kvm_context_t kvm, DPRINTF("memory: gpa: %llx, size: %llx, uaddr: %llx, slot: %x, flags: %lx\n", memory.guest_phys_addr, memory.memory_size, memory.userspace_addr, memory.slot, memory.flags); - r = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &memory); - if (r == -1) { - fprintf(stderr, "create_userspace_phys_mem: %s\n", strerror(errno)); + r = kvm_vm_ioctl(kvm_state, KVM_SET_USER_MEMORY_REGION, &memory); + if (r < 0) { + fprintf(stderr, "create_userspace_phys_mem: %s\n", strerror(-r)); return -1; } register_slot(memory.slot, memory.guest_phys_addr, memory.memory_size, @@ -710,10 +710,10 @@ void kvm_destroy_phys_mem(kvm_context_t kvm, unsigned long phys_start, memory.guest_phys_addr, memory.memory_size, memory.flags); - r = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &memory); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_SET_USER_MEMORY_REGION, &memory); + if (r < 0) { fprintf(stderr, "destroy_userspace_phys_mem: %s", - strerror(errno)); + strerror(-r)); return; } @@ -741,9 +741,9 @@ static int kvm_get_map(kvm_context_t kvm, int ioctl_num, int slot, void *buf) log.dirty_bitmap = buf; - r = ioctl(kvm->vm_fd, ioctl_num, &log); - if (r == -1) - return -errno; + r = kvm_vm_ioctl(kvm_state, ioctl_num, &log); + if (r < 0) + return r; return 0; } @@ -794,8 +794,8 @@ int kvm_set_irq_level(kvm_context_t kvm, int irq, int level, int *status) return 0; event.level = level; event.irq = irq; - r = ioctl(kvm->vm_fd, kvm->irqchip_inject_ioctl, &event); - if (r == -1) + r = kvm_vm_ioctl(kvm_state, kvm->irqchip_inject_ioctl, &event); + if (r < 0) perror("kvm_set_irq_level"); if (status) { @@ -816,9 +816,8 @@ int kvm_get_irqchip(kvm_context_t kvm, struct kvm_irqchip *chip) if (!kvm->irqchip_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_GET_IRQCHIP, chip); - if (r == -1) { - r = -errno; + r = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, chip); + if (r < 0) { perror("kvm_get_irqchip\n"); } return r; @@ -830,9 +829,8 @@ int kvm_set_irqchip(kvm_context_t kvm, struct kvm_irqchip *chip) if (!kvm->irqchip_in_kernel) return 0; - r = ioctl(kvm->vm_fd, KVM_SET_IRQCHIP, chip); - if (r == -1) { - r = -errno; + r = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, chip); + if (r < 0) { perror("kvm_set_irqchip\n"); } return r; @@ -1230,10 +1228,10 @@ int kvm_coalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size) zone.addr = addr; zone.size = size; - r = ioctl(kvm->vm_fd, KVM_REGISTER_COALESCED_MMIO, &zone); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_REGISTER_COALESCED_MMIO, &zone); + if (r < 0) { perror("kvm_register_coalesced_mmio_zone"); - return -errno; + return r; } return 0; } @@ -1253,10 +1251,10 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size) zone.addr = addr; zone.size = size; - r = ioctl(kvm->vm_fd, KVM_UNREGISTER_COALESCED_MMIO, &zone); - if (r == -1) { + r = kvm_vm_ioctl(kvm_state, KVM_UNREGISTER_COALESCED_MMIO, &zone); + if (r < 0) { perror("kvm_unregister_coalesced_mmio_zone"); - return -errno; + return r; } DPRINTF("Unregistered coalesced mmio region for %llx (%lx)\n", addr, size); return 0; @@ -1269,25 +1267,13 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size) int kvm_assign_pci_device(kvm_context_t kvm, struct kvm_assigned_pci_dev *assigned_dev) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_ASSIGN_PCI_DEVICE, assigned_dev); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_ASSIGN_PCI_DEVICE, assigned_dev); } static int kvm_old_assign_irq(kvm_context_t kvm, struct kvm_assigned_irq *assigned_irq) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_ASSIGN_IRQ, assigned_irq); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_ASSIGN_IRQ, assigned_irq); } #ifdef KVM_CAP_ASSIGN_DEV_IRQ @@ -1298,10 +1284,7 @@ int kvm_assign_irq(kvm_context_t kvm, ret = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_ASSIGN_DEV_IRQ); if (ret > 0) { - ret = ioctl(kvm->vm_fd, KVM_ASSIGN_DEV_IRQ, assigned_irq); - if (ret < 0) - return -errno; - return ret; + return kvm_vm_ioctl(kvm_state, KVM_ASSIGN_DEV_IRQ, assigned_irq); } return kvm_old_assign_irq(kvm, assigned_irq); @@ -1310,13 +1293,7 @@ int kvm_assign_irq(kvm_context_t kvm, int kvm_deassign_irq(kvm_context_t kvm, struct kvm_assigned_irq *assigned_irq) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_DEASSIGN_DEV_IRQ, assigned_irq); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_DEASSIGN_DEV_IRQ, assigned_irq); } #else int kvm_assign_irq(kvm_context_t kvm, @@ -1331,13 +1308,7 @@ int kvm_assign_irq(kvm_context_t kvm, int kvm_deassign_pci_device(kvm_context_t kvm, struct kvm_assigned_pci_dev *assigned_dev) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_DEASSIGN_PCI_DEVICE, assigned_dev); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_DEASSIGN_PCI_DEVICE, assigned_dev); } #endif @@ -1364,10 +1335,7 @@ int kvm_reinject_control(kvm_context_t kvm, int pit_reinject) r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_REINJECT_CONTROL); if (r > 0) { - r = ioctl(kvm->vm_fd, KVM_REINJECT_CONTROL, &control); - if (r == -1) - return -errno; - return r; + return kvm_vm_ioctl(kvm_state, KVM_REINJECT_CONTROL, &control); } #endif return -ENOSYS; @@ -1581,13 +1549,8 @@ int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) int kvm_commit_irq_routes(kvm_context_t kvm) { #ifdef KVM_CAP_IRQ_ROUTING - int r; - kvm->irq_routes->flags = 0; - r = ioctl(kvm->vm_fd, KVM_SET_GSI_ROUTING, kvm->irq_routes); - if (r == -1) - r = -errno; - return r; + return kvm_vm_ioctl(kvm_state, KVM_SET_GSI_ROUTING, kvm->irq_routes); #else return -ENOSYS; #endif @@ -1614,25 +1577,13 @@ int kvm_get_irq_route_gsi(kvm_context_t kvm) int kvm_assign_set_msix_nr(kvm_context_t kvm, struct kvm_assigned_msix_nr *msix_nr) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_ASSIGN_SET_MSIX_NR, msix_nr); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_ASSIGN_SET_MSIX_NR, msix_nr); } int kvm_assign_set_msix_entry(kvm_context_t kvm, struct kvm_assigned_msix_entry *entry) { - int ret; - - ret = ioctl(kvm->vm_fd, KVM_ASSIGN_SET_MSIX_ENTRY, entry); - if (ret < 0) - return -errno; - - return ret; + return kvm_vm_ioctl(kvm_state, KVM_ASSIGN_SET_MSIX_ENTRY, entry); } #endif @@ -1642,17 +1593,13 @@ int kvm_assign_set_msix_entry(kvm_context_t kvm, static int _kvm_irqfd(kvm_context_t kvm, int fd, int gsi, int flags) { - int r; struct kvm_irqfd data = { .fd = fd, .gsi = gsi, .flags = flags, }; - r = ioctl(kvm->vm_fd, KVM_IRQFD, &data); - if (r == -1) - r = -errno; - return r; + return kvm_vm_ioctl(kvm_state, KVM_IRQFD, &data); } int kvm_irqfd(kvm_context_t kvm, int gsi, int flags) diff --git a/qemu-kvm.h b/qemu-kvm.h index c90639e..b52a249 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -54,9 +54,6 @@ extern int kvm_abi; struct kvm_context { /// Filedescriptor to /dev/kvm int fd; - int vm_fd; - /// Callbacks that KVM uses to emulate various unvirtualizable functionality - struct kvm_callbacks *callbacks; void *opaque; /// is dirty pages logging enabled for all regions or not int dirty_pages_log_all; @@ -1199,5 +1196,8 @@ typedef struct KVMState struct kvm_context kvm_context; } KVMState; +extern KVMState *kvm_state; + +int kvm_vm_ioctl(KVMState *s, int type, ...); #endif -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html