diff options
author | Jason Wang | 2015-08-25 04:05:46 -0500 |
---|---|---|
committer | Paolo Bonzini | 2015-10-01 08:06:29 -0500 |
commit | d3febddde9c7a959dbb189a700e937db50fad4d6 (patch) | |
tree | 9869821f4df76e998a9b9c83cf8354a1b6e52cba /virt | |
parent | 1c1a9ce973a7863dd46767226bce2a5f12d48bc6 (diff) | |
download | kernel-omap-d3febddde9c7a959dbb189a700e937db50fad4d6.tar.gz kernel-omap-d3febddde9c7a959dbb189a700e937db50fad4d6.tar.xz kernel-omap-d3febddde9c7a959dbb189a700e937db50fad4d6.zip |
kvm: use kmalloc() instead of kzalloc() during iodev register/unregister
All fields of kvm_io_range were initialized or copied explicitly
afterwards. So switch to use kmalloc().
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8db1d9361993..23116dcb2129 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -3341,7 +3341,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, | |||
3341 | if (bus->dev_count - bus->ioeventfd_count > NR_IOBUS_DEVS - 1) | 3341 | if (bus->dev_count - bus->ioeventfd_count > NR_IOBUS_DEVS - 1) |
3342 | return -ENOSPC; | 3342 | return -ENOSPC; |
3343 | 3343 | ||
3344 | new_bus = kzalloc(sizeof(*bus) + ((bus->dev_count + 1) * | 3344 | new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count + 1) * |
3345 | sizeof(struct kvm_io_range)), GFP_KERNEL); | 3345 | sizeof(struct kvm_io_range)), GFP_KERNEL); |
3346 | if (!new_bus) | 3346 | if (!new_bus) |
3347 | return -ENOMEM; | 3347 | return -ENOMEM; |
@@ -3373,7 +3373,7 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, | |||
3373 | if (r) | 3373 | if (r) |
3374 | return r; | 3374 | return r; |
3375 | 3375 | ||
3376 | new_bus = kzalloc(sizeof(*bus) + ((bus->dev_count - 1) * | 3376 | new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count - 1) * |
3377 | sizeof(struct kvm_io_range)), GFP_KERNEL); | 3377 | sizeof(struct kvm_io_range)), GFP_KERNEL); |
3378 | if (!new_bus) | 3378 | if (!new_bus) |
3379 | return -ENOMEM; | 3379 | return -ENOMEM; |