From patchwork Thu Jun 11 12:01:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 49765 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C497B20C81 for ; Thu, 11 Jun 2015 12:24:15 +0000 (UTC) Received: by wgme6 with SMTP id e6sf1458972wgm.3 for ; Thu, 11 Jun 2015 05:24:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:content-type:content-disposition:in-reply-to:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=oEepB8cIayJ4EbSoPEp0FdX4bBvk9sku03vyCL38Ip0=; b=bU9SlarDi/yifxe+IBcnepxA300DCzfLqT2kkY1S+vkvj7gmUa/i+Xu2KZk4yzhI38 C/9XyBszrb8KmSkso+8uFN1oSk5b89Vy3Wd/VPZ3A3N/LawIkSBuKt7e18V7NUQ0/DW/ kjfws6qTXO2JhEo2LWyFIMRHZIB22DOw2V1cj8rJaVP/09cuBcFu9V4vgr34kcTTtB1b sjOI7acYd7/LiowlXJF3LQSUbebFFwDS+aKcFOq+Up8VmIn1gpoJyt7QFVOs3UXEsSb0 iYthsZUxttirr8QG3l5upqEyGg92V8BcgrG7vXfTnXbs2fwgMvEWKt2Q6DLkCIqpsVbh TQ7Q== X-Gm-Message-State: ALoCoQmv98V9eF9Yfna0GTslLPcpocudiuHZsHIulvJ/r58DOeuVmJv0wNV1NaCGNYO0XQAvgAuf X-Received: by 10.180.19.72 with SMTP id c8mr27309156wie.2.1434025455062; Thu, 11 Jun 2015 05:24:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.18 with SMTP id s18ls403821lal.63.gmail; Thu, 11 Jun 2015 05:24:14 -0700 (PDT) X-Received: by 10.152.234.42 with SMTP id ub10mr9490826lac.60.1434025454867; Thu, 11 Jun 2015 05:24:14 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id rd3si437373lac.167.2015.06.11.05.24.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 05:24:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labke4 with SMTP id ke4so3591692lab.0 for ; Thu, 11 Jun 2015 05:24:14 -0700 (PDT) X-Received: by 10.152.29.161 with SMTP id l1mr9542857lah.76.1434025454730; Thu, 11 Jun 2015 05:24:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp4004518lbb; Thu, 11 Jun 2015 05:24:13 -0700 (PDT) X-Received: by 10.140.237.208 with SMTP id i199mr11408275qhc.103.1434025453443; Thu, 11 Jun 2015 05:24:13 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 90si411326qgc.42.2015.06.11.05.24.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Jun 2015 05:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:46068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31Wm-00031j-HY for patch@linaro.org; Thu, 11 Jun 2015 08:24:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31As-0002Ry-EM for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z31Ar-0008Ld-HB for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31Ar-0008LY-CA for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:33 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id E99A5365056; Thu, 11 Jun 2015 12:01:32 +0000 (UTC) Received: from redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t5BC1TXZ020629; Thu, 11 Jun 2015 08:01:30 -0400 Date: Thu, 11 Jun 2015 14:01:29 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1434023714-30366-40-git-send-email-mst@redhat.com> References: <1434023714-30366-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1434023714-30366-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , "Aneesh Kumar K.V" , Shannon Zhao , Cornelia Huck , Paolo Bonzini , Shannon Zhao Subject: [Qemu-devel] [PULL 39/42] virtio-9p-device: move qdev properties into virtio-9p-device.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mst@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao As only one place in virtio-9p-device.c uses DEFINE_VIRTIO_9P_PROPERTIES, there is no need to expose it. Inline it into virtio-9p-device.c to avoid wrongly use. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Paolo Bonzini Acked-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/9pfs/virtio-9p.h | 4 ---- hw/9pfs/virtio-9p-device.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 58dafa9..2e7d488 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -391,8 +391,4 @@ extern int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath, #define VIRTIO_9P(obj) \ OBJECT_CHECK(V9fsState, (obj), TYPE_VIRTIO_9P) -#define DEFINE_VIRTIO_9P_PROPERTIES(_state, _field) \ - DEFINE_PROP_STRING("mount_tag", _state, _field.tag), \ - DEFINE_PROP_STRING("fsdev", _state, _field.fsdev_id) - #endif diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 60f9ff9..3f4c9e7 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -140,7 +140,8 @@ out: /* virtio-9p device */ static Property virtio_9p_properties[] = { - DEFINE_VIRTIO_9P_PROPERTIES(V9fsState, fsconf), + DEFINE_PROP_STRING("mount_tag", V9fsState, fsconf.tag), + DEFINE_PROP_STRING("fsdev", V9fsState, fsconf.fsdev_id), DEFINE_PROP_END_OF_LIST(), };