From patchwork Wed Jun 10 15:04:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 49713 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9F343245D4 for ; Wed, 10 Jun 2015 15:10:32 +0000 (UTC) Received: by wibdt2 with SMTP id dt2sf13454867wib.3 for ; Wed, 10 Jun 2015 08:10:32 -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=DDKDlQ2R90+JvAgSu8pq3nh1W0OJWlq/ogbNI/CXXMI=; b=JV2/i7+8hvh6hE9IvU1laggQ3miO+1I4x71WyFcOHUOhGzHqy3vpkTbgXriFJ/v6mD ohLJxXKBAKg+phuaCm5qJ7GusoiRDwDb4EL9evzg1/P8V0h//VjQCKTuutbLAi3OgYn0 kdKc/RxT/IyxweZG49ST70kssYr3LWpb3zF39LrzAaFUa0aDCkPWAgDSRNk5vWYeOwX0 cDgsVQRlEDLHRfhHMQvhOTZxOFB/PZuo2wpeQTQKRd2XHYl9eEMuBNZFjFLkYRJ4RwPy TUpoTZaI2FUTcuo+M8dDCbkQAFFjjB8msPwvf8CriSiAQvOs2dkXHTj8sZ+WrlLVH4Ms yX6g== X-Gm-Message-State: ALoCoQnm7VZef3lEKb3acYewUZKk+EYujxGnyjFFg6/7Rs/X3MpI9Qs7QlQGjtBcageu+2Eqy/G3 X-Received: by 10.180.221.203 with SMTP id qg11mr22353388wic.7.1433949031976; Wed, 10 Jun 2015 08:10:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.166 with SMTP id z6ls241381laj.64.gmail; Wed, 10 Jun 2015 08:10:31 -0700 (PDT) X-Received: by 10.152.43.134 with SMTP id w6mr4486944lal.120.1433949031749; Wed, 10 Jun 2015 08:10:31 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id dh4si9284840lac.35.2015.06.10.08.10.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jun 2015 08:10:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbqq2 with SMTP id qq2so30750931lbb.3 for ; Wed, 10 Jun 2015 08:10:31 -0700 (PDT) X-Received: by 10.112.97.194 with SMTP id ec2mr4598888lbb.88.1433949031655; Wed, 10 Jun 2015 08:10:31 -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 hn6csp3397742lbb; Wed, 10 Jun 2015 08:10:30 -0700 (PDT) X-Received: by 10.140.231.80 with SMTP id b77mr4843968qhc.82.1433949030347; Wed, 10 Jun 2015 08:10:30 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q78si8920862qgq.84.2015.06.10.08.10.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 10 Jun 2015 08:10:30 -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]:40923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2he9-0004eX-FM for patch@linaro.org; Wed, 10 Jun 2015 11:10:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2ha6-0006uc-A4 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2ha0-0006fv-09 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:18 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:33465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2hZz-0006fA-Qu for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:11 -0400 Received: by pdjn11 with SMTP id n11so39776087pdj.0 for ; Wed, 10 Jun 2015 08:06:11 -0700 (PDT) X-Received: by 10.68.135.73 with SMTP id pq9mr6550271pbb.46.1433948771311; Wed, 10 Jun 2015 08:06:11 -0700 (PDT) Received: from localhost.localdomain ([167.160.116.93]) by mx.google.com with ESMTPSA id w8sm2687917pbt.45.2015.06.10.08.06.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jun 2015 08:06:09 -0700 (PDT) From: Shannon Zhao To: qemu-devel@nongnu.org Date: Wed, 10 Jun 2015 23:04:35 +0800 Message-Id: <1433948676-14395-7-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433948676-14395-1-git-send-email-shannon.zhao@linaro.org> References: <1433948676-14395-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.192.175 Cc: zhaoshenglong@huawei.com, shannon.zhao@linaro.org, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 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.181 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 Reviewed-by: Paolo Bonzini Acked-by: Cornelia Huck --- 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 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(), }; 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