From nobody Tue Feb 10 21:59:36 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 1500027464397404.6590604390267; Fri, 14 Jul 2017 03:17:44 -0700 (PDT) Received: from localhost ([::1]:36739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxey-0006QL-OB for importer@patchew.org; Fri, 14 Jul 2017 06:17:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxYg-0000Nq-QG 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 1dVxYb-00052N-Qz for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:50 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVxYb-000525-Ik for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:45 -0400 Received: by mail-wr0-x243.google.com with SMTP id 77so11332395wrb.3 for ; Fri, 14 Jul 2017 03:10:45 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 03:10:43 -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=Tmz1kYJZaXrrwp8u68pvKrXk0lkId88/dUAIyvlXPps=; b=Di5F6Qzlwrzod0lJuiWUiA3TZ8ghGbMjQev5JHJ9gODR/reDIHm6kmV6HvyqpaWybM 4Z8YbpxDw/ZEXPMvSh7E434UyH/ZgTUcUWmAgR6ZMqipFU/csZ4bJdX6qpsx4f4Y2zdE gDUVHF0bGkn5Pihgad5JHvrwO0a+CXYCJawulD/JDseAPFUX8Zjz8B894J5NEoc+US6n BMz231s7G+CTWY4xicEJD4gBSocGcs8vurFQy2NklSB1LGvmVlx3v2PzxyUArXbB4cdF w90/c1p8iJjX6FqEVXpoxU13VYQCtdP+hEFwYD8bZKBzO3Zkhc8Dz748ZCKAjDm+vOBi t3rA== 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=Tmz1kYJZaXrrwp8u68pvKrXk0lkId88/dUAIyvlXPps=; b=AhMwWllk2/h7DAlj2UJwk1dioqHysYVDzTLfgBI687Yc/rvptO0kmIln4ktMaTj7A8 23xTFOnLomwPrt2VSCVzasVliM8+S7a4qcNiTohq/huAjBimsOtO8y7XqMd3rkKFqeNT pVGoen2oC7krCWOb+QvNdFn6CXi+S4v8oUeqYeRLHHxv0s2kHH0rco2nBOMZeYU//qwP eWQuFfbQY08sKH0sFM6keBXTDJ7hTH1ylp43RqsMl8TlxOOaFac1wj0iNVd1a4saNnL6 d2Fi/e4TAfV2kDjox8MPIKMPQvDHbwoZD03XN8KJcUlrIrrT/bUY9EHdBCBQHT28cgwE wFCA== X-Gm-Message-State: AIVw112KvySb/NZ6PNV/OlZuftrjA6iIKI4hd0MLQ2O2bu3X3v4NmChI gWjeQSBVN+069D6PX18= X-Received: by 10.223.129.6 with SMTP id 6mr3855916wrm.23.1500027044209; Fri, 14 Jul 2017 03:10:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:10:21 +0200 Message-Id: <1500027028-4127-10-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::243 Subject: [Qemu-devel] [PULL 48/55] virtio-scsi: 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 Signed-off-by: Fam Zheng Message-Id: <20170714021509.23681-8-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/s390x/virtio-ccw.c | 2 -- hw/scsi/virtio-scsi.c | 13 ++----------- hw/virtio/virtio-pci.c | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a0437d1..c5e0606 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -950,8 +950,6 @@ static void virtio_ccw_scsi_instance_init(Object *obj) =20 virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SCSI); - object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothre= ad", - &error_abort); } =20 #ifdef CONFIG_VHOST_SCSI diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index d076fe7..eb63944 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -898,16 +898,6 @@ static void virtio_scsi_device_realize(DeviceState *de= v, Error **errp) virtio_scsi_dataplane_setup(s, errp); } =20 -static void virtio_scsi_instance_init(Object *obj) -{ - VirtIOSCSICommon *vs =3D VIRTIO_SCSI_COMMON(obj); - - object_property_add_link(obj, "iothread", TYPE_IOTHREAD, - (Object **)&vs->conf.iothread, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); -} - void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); @@ -935,6 +925,8 @@ static Property virtio_scsi_properties[] =3D { VIRTIO_SCSI_F_HOTPLUG, true), DEFINE_PROP_BIT("param_change", VirtIOSCSI, host_features, VIRTIO_SCSI_F_CHANGE, true= ), + DEFINE_PROP_LINK("iothread", VirtIOSCSI, parent_obj.conf.iothread, + TYPE_IOTHREAD, IOThread *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -989,7 +981,6 @@ static const TypeInfo virtio_scsi_info =3D { .name =3D TYPE_VIRTIO_SCSI, .parent =3D TYPE_VIRTIO_SCSI_COMMON, .instance_size =3D sizeof(VirtIOSCSI), - .instance_init =3D virtio_scsi_instance_init, .class_init =3D virtio_scsi_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 94f72f3..cc69fe3 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2069,8 +2069,6 @@ static void virtio_scsi_pci_instance_init(Object *obj) =20 virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SCSI); - object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothre= ad", - &error_abort); } =20 static const TypeInfo virtio_scsi_pci_info =3D { --=20 1.8.3.1