From patchwork Wed Apr 29 15:24:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47731 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C585A2121F for ; Wed, 29 Apr 2015 15:29:59 +0000 (UTC) Received: by wgin8 with SMTP id n8sf7477217wgi.0 for ; Wed, 29 Apr 2015 08:29:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references: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=8bOjF8C2GZF37u74DlxChX6yAxCvrQ3fLBjj8dSB4+g=; b=E4asdBRmdAotS4l+W4gGDIxXrnly18Rlf7A68jDPjoBSP2OMLvLE84RByfQU6b7iTy Qytqpee54wTbJZKm2N6paKnBKH32CCoX3c+2BFNbgxF5i8F1fh0eM/W1Ws/rgRfDyd3t WN/GEYNcMKooiIDwT1d/n6Xn/pgulaQ+UxO6FtBII2tskw4zeHogc5L+KNfX5h0eocMA Q4UwVY6BPKzCZ9YSrAqNLjc2purGjwGg45WHqjlSZj2qrSyMBXkXAQ3wZClAhElNu2VC HXwwWuki9qmnzuvQ71nnadDoxx+3qfe9ZAGxoHLPVdJJJxgWAeKkV+Qws+WXjwElnRx4 4HlA== X-Gm-Message-State: ALoCoQkcgLEcCDfyhMODpROb2dTQlJUlkWaVrlOzzcOIq2jQTKWLxsBF0LXevYh7zfk5SYBevoex X-Received: by 10.113.11.3 with SMTP id ee3mr13626660lbd.9.1430321398905; Wed, 29 Apr 2015 08:29:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.208 with SMTP id k16ls258721lab.42.gmail; Wed, 29 Apr 2015 08:29:58 -0700 (PDT) X-Received: by 10.152.7.97 with SMTP id i1mr18966049laa.49.1430321398687; Wed, 29 Apr 2015 08:29:58 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id ps10si19611957lbb.26.2015.04.29.08.29.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2015 08:29:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbcga7 with SMTP id ga7so23154947lbc.1 for ; Wed, 29 Apr 2015 08:29:58 -0700 (PDT) X-Received: by 10.152.9.66 with SMTP id x2mr19387093laa.36.1430321398351; Wed, 29 Apr 2015 08:29:58 -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.67.65 with SMTP id l1csp2576239lbt; Wed, 29 Apr 2015 08:29:57 -0700 (PDT) X-Received: by 10.55.20.139 with SMTP id 11mr28283350qku.28.1430321397233; Wed, 29 Apr 2015 08:29:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i7si21279974qcm.27.2015.04.29.08.29.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Apr 2015 08:29:57 -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]:39668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnTvw-0004Nl-E6 for patch@linaro.org; Wed, 29 Apr 2015 11:29:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnTrm-0006jK-QH for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:25:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnTri-0004bK-Bh for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:25:38 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:36220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnTri-0004bE-5b for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:25:34 -0400 Received: by pabsx10 with SMTP id sx10so30746281pab.3 for ; Wed, 29 Apr 2015 08:25:33 -0700 (PDT) X-Received: by 10.70.54.164 with SMTP id k4mr24305782pdp.61.1430321133593; Wed, 29 Apr 2015 08:25:33 -0700 (PDT) Received: from localhost.localdomain ([180.150.153.56]) by mx.google.com with ESMTPSA id cu8sm25875045pad.1.2015.04.29.08.25.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Apr 2015 08:25:32 -0700 (PDT) From: Shannon Zhao To: qemu-devel@nongnu.org Date: Wed, 29 Apr 2015 23:24:08 +0800 Message-Id: <1430321049-11859-7-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430321049-11859-1-git-send-email-shannon.zhao@linaro.org> References: <1430321049-11859-1-git-send-email-shannon.zhao@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.50 Cc: peter.maydell@linaro.org, hangaohuai@huawei.com, mst@redhat.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org, zhaoshenglong@huawei.com, pbonzini@redhat.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH 6/7] 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: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 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 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 --- hw/9pfs/virtio-9p-device.c | 3 ++- hw/9pfs/virtio-9p.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 30492ec..8b604af 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(), }; 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