mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivshmem: Drop ivshmem property x-memdev

Browse Source 
Use ivshmem-plain instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1458066895-20632-39-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2016-03-15 19:34:53 +01:00
parent ddc8528443
commit 13fd2cb689
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/misc/ivshmem.c
View File

@ -1210,17 +1210,12 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp)
" or ivshmem-doorbell instead"); " or ivshmem-doorbell instead");
} }
if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 1) { if (!!s->server_chr + !!s->shmobj != 1) {
error_setg(errp, error_setg(errp, "You must specify either 'shm' or 'chardev'");
"You must specify either 'shm', 'chardev' or 'x-memdev'");
return; return;
} }
if (s->hostmem) { if (s->sizearg == NULL) {
if (s->sizearg) {
g_warning("size argument ignored with hostmem");
}
} else if (s->sizearg == NULL) {
s->legacy_size = 4 << 20; /* 4 MB default */ s->legacy_size = 4 << 20; /* 4 MB default */
} else { } else {
char *end; char *end;
@ -1260,17 +1255,6 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp)
ivshmem_common_realize(dev, errp); ivshmem_common_realize(dev, errp);
} }
static void ivshmem_init(Object *obj)
{
IVShmemState *s = IVSHMEM(obj);
object_property_add_link(obj, "x-memdev", TYPE_MEMORY_BACKEND,
(Object **)&s->hostmem,
ivshmem_check_memdev_is_busy,
OBJ_PROP_LINK_UNREF_ON_RELEASE,
&error_abort);
}
static void ivshmem_class_init(ObjectClass *klass, void *data) static void ivshmem_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
@ -1287,7 +1271,6 @@ static const TypeInfo ivshmem_info = {
.name = TYPE_IVSHMEM, .name = TYPE_IVSHMEM,
.parent = TYPE_IVSHMEM_COMMON, .parent = TYPE_IVSHMEM_COMMON,
.instance_size = sizeof(IVShmemState), .instance_size = sizeof(IVShmemState),
.instance_init = ivshmem_init,
.class_init = ivshmem_class_init, .class_init = ivshmem_class_init,
}; };