From nobody Mon Feb 9 19:37:29 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 1500028278297405.8011050056339; Fri, 14 Jul 2017 03:31:18 -0700 (PDT) Received: from localhost ([::1]:36817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxsT-0003V1-1H for importer@patchew.org; Fri, 14 Jul 2017 06:31:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxYg-0000Nv-Qq 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 1dVxYe-00053T-2i for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:50 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVxYd-00053B-OA for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:48 -0400 Received: by mail-wm0-x242.google.com with SMTP id p204so9958224wmg.1 for ; Fri, 14 Jul 2017 03:10:47 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 03:10:45 -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=8YDg/JrvqTzvmC/fyQaX4tP+3th/MJoMYbrAPPnMg1A=; b=F9IufdbbPmM86w4OUx5ABb+R+D5zk2HPDe0uRwdLv5Z53K9pA7BNw0E7q2mLPZZZPe cEITRpVCLCm8+ZKwHMLAO3h//Z/b3HZsH0B9YEwBgU2QXSdI0hXnfCrq8yU42B7v9uXq w5Tu0k62MA6lLS30A5XHtUJSRn/ST1LJJKPxaKolvTgfvnQo6/uRLa/T0ribHTMXzocM z4CWw82nPZcIEOK9ynmFXxAmw5LosM2xEu2BNpXOQdSTW5ygLSPKvg0CAVLDJKfCa0iA T3VQF31/VNICb9U5RgFDPu6d63B2+WiA2PAzfDuAQL0Vey0kreIApui/PTmllgKvU72/ Wqdw== 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=8YDg/JrvqTzvmC/fyQaX4tP+3th/MJoMYbrAPPnMg1A=; b=uJvUIjMgtp8L3eX6TFOXVT5JK5ITun5+EMqF85CIetau/YLvzj4uv+OvxL+4GUXU4d AJqVHYSCZusrpkx3MCev/k5TT1RWsq3yTKLt+ai9iixQinDiGOOKnVhjjHa/e0uO/Ugx egeFcyZm+f0kKPLfjGqWQhfgA8OfTKFLpm5NEuH8QU/RlRP/ilQyV+P+fN/ApP/Z6mcx BuIN397m9lKFoU8zjUI4yA4UokbJgaYWn8HQf/aEPvDLhlXDSzEQIXMv3tRS0dm7gkt4 ZzBn16C/6LYUJMFaeEcHu7l4g0lkSMgIEtSqYKuSj+YEikiLjwgJijW66hYqXpXySwgq A78Q== X-Gm-Message-State: AIVw112SPhrU1npdOWrwTSvYVx3d3dcur/1PGTxMCA4SZe5gx+YZ5kc5 sxGkXBYiFpr23/LP6Wo= X-Received: by 10.28.15.135 with SMTP id 129mr2452943wmp.38.1500027046435; Fri, 14 Jul 2017 03:10:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:10:23 +0200 Message-Id: <1500027028-4127-12-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:c09::242 Subject: [Qemu-devel] [PULL 50/55] virtio-crypto: 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 other object_property_add_link() occurrences in virtio devices, virtio-crypto checks the "in use" state of the linked backend object in addition to qdev_prop_allow_set_link_before_realize. To convert it without needing to specialize DEFINE_PROP_LINK which always uses the qdev callback, move the "in use" check to device realize time. Signed-off-by: Fam Zheng Message-Id: <20170714021509.23681-10-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/s390x/virtio-ccw.c | 3 --- hw/virtio/virtio-crypto-pci.c | 2 -- hw/virtio/virtio-crypto.c | 27 +++++++-------------------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a492d0f..c07ddb1 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1594,9 +1594,6 @@ static void virtio_ccw_crypto_instance_init(Object *o= bj) ccw_dev->force_revision_1 =3D true; virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_CRYPTO); - - object_property_add_alias(obj, "cryptodev", OBJECT(&dev->vdev), - "cryptodev", &error_abort); } =20 static void virtio_ccw_crypto_class_init(ObjectClass *klass, void *data) diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index 422aca3..bf64996 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -62,8 +62,6 @@ static void virtio_crypto_initfn(Object *obj) =20 virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_CRYPTO); - object_property_add_alias(obj, "cryptodev", OBJECT(&dev->vdev), - "cryptodev", &error_abort); } =20 static const TypeInfo virtio_crypto_pci_info =3D { diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 2590893..19c82e0 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -781,6 +781,11 @@ static void virtio_crypto_device_realize(DeviceState *= dev, Error **errp) if (vcrypto->cryptodev =3D=3D NULL) { error_setg(errp, "'cryptodev' parameter expects a valid object"); return; + } else if (cryptodev_backend_is_used(vcrypto->cryptodev)) { + char *path =3D object_get_canonical_path_component(OBJECT(vcrypto-= >conf.cryptodev)); + error_setg(errp, "can't use already used cryptodev backend: %s", p= ath); + g_free(path); + return; } =20 vcrypto->max_queues =3D MAX(vcrypto->cryptodev->conf.peers.queues, 1); @@ -845,6 +850,8 @@ static const VMStateDescription vmstate_virtio_crypto = =3D { }; =20 static Property virtio_crypto_properties[] =3D { + DEFINE_PROP_LINK("cryptodev", VirtIOCrypto, conf.cryptodev, + TYPE_CRYPTODEV_BACKEND, CryptoDevBackend *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -888,20 +895,6 @@ static void virtio_crypto_class_init(ObjectClass *klas= s, void *data) vdc->reset =3D virtio_crypto_reset; } =20 -static void -virtio_crypto_check_cryptodev_is_used(const Object *obj, const char *name, - Object *val, Error **errp) -{ - if (cryptodev_backend_is_used(CRYPTODEV_BACKEND(val))) { - char *path =3D object_get_canonical_path_component(val); - error_setg(errp, - "can't use already used cryptodev backend: %s", path); - g_free(path); - } else { - qdev_prop_allow_set_link_before_realize(obj, name, val, errp); - } -} - static void virtio_crypto_instance_init(Object *obj) { VirtIOCrypto *vcrypto =3D VIRTIO_CRYPTO(obj); @@ -911,12 +904,6 @@ static void virtio_crypto_instance_init(Object *obj) * Can be overriden with virtio_crypto_set_config_size. */ vcrypto->config_size =3D sizeof(struct virtio_crypto_config); - - object_property_add_link(obj, "cryptodev", - TYPE_CRYPTODEV_BACKEND, - (Object **)&vcrypto->conf.cryptodev, - virtio_crypto_check_cryptodev_is_used, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); } =20 static const TypeInfo virtio_crypto_info =3D { --=20 1.8.3.1