diff options
| author | Andreas Herrmann <andreas.herrmann@caviumnetworks.com> | 2015-06-15 12:49:44 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-06-16 18:25:33 +0100 |
| commit | 7f9733c2dd4aff9dbb5e0655497c5e1f47ccd9a8 (patch) | |
| tree | 48e3bdbe809e3036dfa4f36d6488fb29c7190f7f | |
| parent | f83dc816a9c76f87ad90723f366700077fb367ea (diff) | |
| download | kvmtool-7f9733c2dd4aff9dbb5e0655497c5e1f47ccd9a8.tar.gz | |
kvmtool: Register each guest memory bank as vhost_memory_region
Otherwise vhost does not work if a virtio descriptor is used that was
allocated from a guest memory bank not registered as
vhost_memory_region.
Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | virtio/net.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/virtio/net.c b/virtio/net.c index 122a9e25..97845203 100644 --- a/virtio/net.c +++ b/virtio/net.c @@ -639,23 +639,28 @@ static struct virtio_ops net_dev_virtio_ops = (struct virtio_ops) { static void virtio_net__vhost_init(struct kvm *kvm, struct net_dev *ndev) { + struct kvm_mem_bank *bank; struct vhost_memory *mem; - int r; + int r, i; ndev->vhost_fd = open("/dev/vhost-net", O_RDWR); if (ndev->vhost_fd < 0) die_perror("Failed openning vhost-net device"); - mem = calloc(1, sizeof(*mem) + sizeof(struct vhost_memory_region)); + mem = calloc(1, sizeof(*mem) + kvm->mem_slots * sizeof(struct vhost_memory_region)); if (mem == NULL) die("Failed allocating memory for vhost memory map"); - mem->nregions = 1; - mem->regions[0] = (struct vhost_memory_region) { - .guest_phys_addr = 0, - .memory_size = kvm->ram_size, - .userspace_addr = (unsigned long)kvm->ram_start, - }; + i = 0; + list_for_each_entry(bank, &kvm->mem_banks, list) { + mem->regions[i] = (struct vhost_memory_region) { + .guest_phys_addr = bank->guest_phys_addr, + .memory_size = bank->size, + .userspace_addr = (unsigned long)bank->host_addr, + }; + i++; + } + mem->nregions = i; r = ioctl(ndev->vhost_fd, VHOST_SET_OWNER); if (r != 0) |