From patchwork Fri Jul 14 10:10:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 788302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x886672Kdz9s7m for ; Fri, 14 Jul 2017 20:28:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sSokKr4A"; dkim-atps=neutral Received: from localhost ([::1]:36790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxpV-00089X-1Y for incoming@patchwork.ozlabs.org; Fri, 14 Jul 2017 06:28:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxYb-0000Im-O0 for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVxYa-00051z-Cy for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:45 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:35206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVxYa-00051a-6g for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:44 -0400 Received: by mail-wr0-x241.google.com with SMTP id y28so6807409wrd.2 for ; Fri, 14 Jul 2017 03:10:44 -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=whVVlVWkgUKw1KcC4BRZUhPnHrsk/PWI7ik6AVLsHIM=; b=sSokKr4AcSHHBbPIc2yPaDvUGHe+eaTnRvPs1t8iej3Uhg0TY+9Gtrd9svs2wJCDzI KiZ0HSEkcZmulFc72sDee2rGVN8kTgoPinc1vbIG+09JRN30+Mygt9jpj9v9PY2T7u3A BEhWMd0XMXb0OKEG8s0iw6UbVau54DfoZbn3iEusJOSPUJ+7sZUZWedSi/q/NH1zI+Xz scYt82nfa6eqU6rfO1rOp7vsElQ6j2cj0WOs2eCjhy9We7VqndF+RgusGCPv9HGsioqk tkdcKe9PQ//TFwrR+9ywdSORvfzjXDdXupfa6LcWh5XETp3lgUIJrw9kwQGzu/4fel8G nOpg== 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=whVVlVWkgUKw1KcC4BRZUhPnHrsk/PWI7ik6AVLsHIM=; b=cOWWiYk3apSVj2Kxp17aPnvbVfGfaIDngqgfU+lxz1A2MlCVj73e1At9q+gkV6VFac nv/LvICxJA5UNlw50RodOzJn36/WzxZMDdNmUhBnMPDniDsM+I0sR4QWa18mytKFpaiP uZas1MAOJSd6cfkcn9UHVpk4Wroex7EtNKre4YhgRcut6J0H8HPMYd1jzJ46P1a/uzCo S4f+SrJL9Qg+fQ/ldhOoq+E11hbVW1QXounQ76uBE1RPBjTf8rPPOGPPKTkC3v0N83oT eq5hGsGXf4net5rumarsOmpAoiFgXt+iAe+kkBHgTIrB7QX4Bon4fk1RETYHCWTom1i9 APMg== X-Gm-Message-State: AIVw111UOCHuNvsVoshZ9JwwrS6spdjI0G1TTTI60C6blfukeZXSqHy+ Hy+PljDMc0JfSswas/E= X-Received: by 10.223.179.193 with SMTP id x1mr4467314wrd.86.1500027043055; Fri, 14 Jul 2017 03:10:43 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 03:10:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:10:20 +0200 Message-Id: <1500027028-4127-9-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::241 Subject: [Qemu-devel] [PULL 47/55] virtio-blk: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng Signed-off-by: Fam Zheng Message-Id: <20170714021509.23681-7-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/block/virtio-blk.c | 6 ++---- hw/s390x/virtio-ccw.c | 2 -- hw/virtio/virtio-pci.c | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index c0bd247..b750bd8 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -983,10 +983,6 @@ static void virtio_blk_instance_init(Object *obj) { VirtIOBlock *s = VIRTIO_BLK(obj); - object_property_add_link(obj, "iothread", TYPE_IOTHREAD, - (Object **)&s->conf.iothread, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); device_add_bootindex_property(obj, &s->conf.conf.bootindex, "bootindex", "/disk@0,0", DEVICE(obj), NULL); @@ -1014,6 +1010,8 @@ static Property virtio_blk_properties[] = { DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0, true), DEFINE_PROP_UINT16("num-queues", VirtIOBlock, conf.num_queues, 1), + DEFINE_PROP_LINK("iothread", VirtIOBlock, conf.iothread, TYPE_IOTHREAD, + IOThread *), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e18fd26..a0437d1 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -867,8 +867,6 @@ static void virtio_ccw_blk_instance_init(Object *obj) virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BLK); - object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread", - &error_abort); object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), "bootindex", &error_abort); } diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 93480a7..94f72f3 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2000,8 +2000,6 @@ static void virtio_blk_pci_instance_init(Object *obj) virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BLK); - object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread", - &error_abort); object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), "bootindex", &error_abort); }