From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaSkq-0002JI-Pc for qemu-devel@nongnu.org; Mon, 29 Feb 2016 13:41:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaSkk-0007ui-1S for qemu-devel@nongnu.org; Mon, 29 Feb 2016 13:41:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaSkj-0007uQ-Ri for qemu-devel@nongnu.org; Mon, 29 Feb 2016 13:41:05 -0500 From: Markus Armbruster Date: Mon, 29 Feb 2016 19:40:52 +0100 Message-Id: <1456771254-17511-37-git-send-email-armbru@redhat.com> In-Reply-To: <1456771254-17511-1-git-send-email-armbru@redhat.com> References: <1456771254-17511-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 36/38] ivshmem: Drop ivshmem property x-memdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, cam@cs.ualberta.ca, mlureau@redhat.com, david.marchand@6wind.com, pbonzini@redhat.com Use ivshmem-plain instead. Signed-off-by: Markus Armbruster --- hw/misc/ivshmem.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 33b6842..f6fce15 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1197,8 +1197,7 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp) } if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 1) { - error_setg(errp, - "You must specify either 'shm', 'chardev' or 'x-memdev'"); + error_setg(errp, "You must specify either 'shm' or 'chardev'"); return; } @@ -1246,17 +1245,6 @@ static void ivshmem_realize(PCIDevice *dev, Error **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) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -1273,7 +1261,6 @@ static const TypeInfo ivshmem_info = { .name = TYPE_IVSHMEM, .parent = TYPE_IVSHMEM_COMMON, .instance_size = sizeof(IVShmemState), - .instance_init = ivshmem_init, .class_init = ivshmem_class_init, }; -- 2.4.3