From nobody Mon Feb 9 19:37:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150002760808955.83855705234066; Fri, 14 Jul 2017 03:20:08 -0700 (PDT) Received: from localhost ([::1]:36747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxhe-0000wM-Iy for importer@patchew.org; Fri, 14 Jul 2017 06:20:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxYh-0000Ok-NG for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVxYg-00054P-4U for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:51 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35209) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVxYf-00053x-Q0 for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:50 -0400 Received: by mail-wr0-x244.google.com with SMTP id y28so6807577wrd.2 for ; Fri, 14 Jul 2017 03:10:49 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id 143sm2934870wmg.9.2017.07.14.03.10.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 03:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MC6ZcbYMtLjaZlD4KsHWdxWsOUkU4jnmx5GoCkNOksU=; b=YaNWb+P8q33HWXm2oaZUJ1adJ5ob6zgDKoYEKlrOVymnB713yfuzp5o1Hit9ALFzEg izaQs40OLDbqaloIIBPCkDFbMrKK/XgQWAewaoHCiEiUEwyiNZqVB8RDakIh68KFzefv KHEq/4XQD43FniLxTgJ/3KPXdglbeQKTmIfREDgKi9CYC70iGMP0L9DZtm8SCU13mvpO hDgS2OMMe0XncAg93arxozQCwf1nKhYEnAuhX6MAY2Xo2jtiG7YeSFvmVWSc0OBNHaKf qanovuFutq85EOr+99E1RDXBWFaHKJIGDuMEZIlW+8J8jR0S1qhGxCuQFRgUzJzsAUdQ C2Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MC6ZcbYMtLjaZlD4KsHWdxWsOUkU4jnmx5GoCkNOksU=; b=cWxMdBdTWyOSrSHzgaTGo2yV4jp/YdPlT6eAIPw3isFN4kjH8vtoaoscavqfWtbkgp nFtZObhlTDtM9hKGMEgsDrQNY4YqvWsUWJnEbfXS7zVWVaFlyG6KkT1L/+AvYEz71B9k jinKtl9xAo3EUkbN/LkK41E/vZl4qQcFeARZtxQVevFL7lwjonkbrz8ZxRPpmhigFBiX l4ysdJj7vOYtxE5vDnIdvpPdRBgSJKMA7bWPdTiqHcHtqOBoU3/vVqj6jiaCnEDRJLAs gWxju813G6yYWNf8Ng4PEzpZolont/JzKt1J866g68HPqje2g+tR3bR0Yq/GrrxKhHG+ pMOg== X-Gm-Message-State: AIVw110E+5Fpp48fJ+qNlcCVc87uUG6e8Ou3g2zxPUQJWIVv64dN5G0Q zH0i3dSHpX6Zl7k85q4= X-Received: by 10.223.130.110 with SMTP id 101mr4012269wrb.21.1500027048528; Fri, 14 Jul 2017 03:10:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:10:25 +0200 Message-Id: <1500027028-4127-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500027028-4127-1-git-send-email-pbonzini@redhat.com> References: <1500027028-4127-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 52/55] ivshmem: Convert to DEFINE_PROP_LINK X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng Unlike the usual object_property_add_link() invocations in other devices, ivshmem checks the "is mapped" state of the backend in addition to qdev_prop_allow_set_link_before_realize. To convert it without specializing DEFINE_PROP_LINK which always uses the qdev callback, move the extra check to device realize time. Signed-off-by: Fam Zheng Message-Id: <20170714021509.23681-12-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/misc/ivshmem.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 731f3c1..a58f9ee 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1009,18 +1009,6 @@ static const TypeInfo ivshmem_common_info =3D { .class_init =3D ivshmem_common_class_init, }; =20 -static void ivshmem_check_memdev_is_busy(const Object *obj, const char *na= me, - Object *val, Error **errp) -{ - if (host_memory_backend_is_mapped(MEMORY_BACKEND(val))) { - char *path =3D object_get_canonical_path_component(val); - error_setg(errp, "can't use already busy memdev: %s", path); - g_free(path); - } else { - qdev_prop_allow_set_link_before_realize(obj, name, val, errp); - } -} - static const VMStateDescription ivshmem_plain_vmsd =3D { .name =3D TYPE_IVSHMEM_PLAIN, .version_id =3D 0, @@ -1037,6 +1025,8 @@ static const VMStateDescription ivshmem_plain_vmsd = =3D { =20 static Property ivshmem_plain_properties[] =3D { DEFINE_PROP_ON_OFF_AUTO("master", IVShmemState, master, ON_OFF_AUTO_OF= F), + DEFINE_PROP_LINK("memdev", IVShmemState, hostmem, TYPE_MEMORY_BACKEND, + HostMemoryBackend *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1044,11 +1034,6 @@ static void ivshmem_plain_init(Object *obj) { IVShmemState *s =3D IVSHMEM_PLAIN(obj); =20 - object_property_add_link(obj, "memdev", TYPE_MEMORY_BACKEND, - (Object **)&s->hostmem, - ivshmem_check_memdev_is_busy, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); s->not_legacy_32bit =3D 1; } =20 @@ -1059,6 +1044,11 @@ static void ivshmem_plain_realize(PCIDevice *dev, Er= ror **errp) if (!s->hostmem) { error_setg(errp, "You must specify a 'memdev'"); return; + } else if (host_memory_backend_is_mapped(s->hostmem)) { + char *path =3D object_get_canonical_path_component(OBJECT(s->hostm= em)); + error_setg(errp, "can't use already busy memdev: %s", path); + g_free(path); + return; } =20 ivshmem_common_realize(dev, errp); --=20 1.8.3.1