From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aftoF-0006r1-8q for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aftoB-0001wY-Mg for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aftoB-0001w7-Gr for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:07 -0400 From: Markus Armbruster Date: Tue, 15 Mar 2016 19:34:53 +0100 Message-Id: <1458066895-20632-39-git-send-email-armbru@redhat.com> In-Reply-To: <1458066895-20632-1-git-send-email-armbru@redhat.com> References: <1458066895-20632-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 38/40] 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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/misc/ivshmem.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 49e363e..90930f2 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1197,17 +1197,12 @@ static void ivshmem_realize(PCIDevice *dev, Error= **errp) " or ivshmem-doorbell instead"); } =20 - if (!!s->server_chr + !!s->shmobj + !!s->hostmem !=3D 1) { - error_setg(errp, - "You must specify either 'shm', 'chardev' or 'x-memde= v'"); + if (!!s->server_chr + !!s->shmobj !=3D 1) { + error_setg(errp, "You must specify either 'shm' or 'chardev'"); return; } =20 - if (s->hostmem) { - if (s->sizearg) { - g_warning("size argument ignored with hostmem"); - } - } else if (s->sizearg =3D=3D NULL) { + if (s->sizearg =3D=3D NULL) { s->legacy_size =3D 4 << 20; /* 4 MB default */ } else { char *end; @@ -1247,17 +1242,6 @@ static void ivshmem_realize(PCIDevice *dev, Error = **errp) ivshmem_common_realize(dev, errp); } =20 -static void ivshmem_init(Object *obj) -{ - IVShmemState *s =3D 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 =3D DEVICE_CLASS(klass); @@ -1274,7 +1258,6 @@ static const TypeInfo ivshmem_info =3D { .name =3D TYPE_IVSHMEM, .parent =3D TYPE_IVSHMEM_COMMON, .instance_size =3D sizeof(IVShmemState), - .instance_init =3D ivshmem_init, .class_init =3D ivshmem_class_init, }; =20 --=20 2.4.3