clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-06-16 02:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvmtool: Register each guest memory bank as vhost_memory_region

Browse Source 
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>
This commit is contained in:
Andreas Herrmann
2015-06-15 12:49:44 +01:00
committed by Will Deacon
parent f83dc816a9
commit 7f9733c2dd
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio/net.c
+13 -8
View File
@@ -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)