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: 466168 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 4065114007D for ; Thu, 30 Apr 2015 01:29:48 +1000 (AEST) Received: from localhost ([::1]:39668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnTvm-0004Nl-Dj for incoming@patchwork.ozlabs.org; Wed, 29 Apr 2015 11:29:46 -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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8bOjF8C2GZF37u74DlxChX6yAxCvrQ3fLBjj8dSB4+g=; b=L8uXb2xNpi7jTfPl9paeR9OiAsKv40Y85xcx3/Eogzr2v9JpK1ANVBybTC2sh9Olx/ agLyD/9QqhLcnWfudWCqGUTvjs/ZOxUb3uvS5btPrZZLZ+whGL76+2W2P/7yhQlxT6of 7lomxLu6jgV4u0ZXBwDgeO8nIZI5XaHqyDao0Vuu9GmsaRRXyJaSTryExRtDSZfU1Sav daBJeGMtl3AkHaa3N8B5qFJi1qkHJd7ix3k4Q0TDRkYQfyrDfDWvtQpcXNx6cXZWpSfU t96rBwijtg2Hz0zknRcqyg9hTPIAZ/SvoaNHakbu/9bSbQOP3/55u6D01KwkXE0CVtm8 bYEw== X-Gm-Message-State: ALoCoQlRwLdP70jYC68/TYF8mJHYah+KqApw+hH8ubHh0sunIKqWi+mNpLslG4tHN3LmnWzdMAgh 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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