From patchwork Wed Jun 10 15:04:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 482720 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 B3A041401AB for ; Thu, 11 Jun 2015 01:07:12 +1000 (AEST) Received: from localhost ([::1]:40894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2hav-0008Jg-V3 for incoming@patchwork.ozlabs.org; Wed, 10 Jun 2015 11:07:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2haE-00079S-I9 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2haA-0006jt-7c for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:26 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:32850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2haA-0006jk-16 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 11:06:22 -0400 Received: by padev16 with SMTP id ev16so36748644pad.0 for ; Wed, 10 Jun 2015 08:06:21 -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=MthuuqbEn6uGYSLNqB/Fsmy6hqkbgQycfdWRxVbppck=; b=Ikrky93NBVNjo6mIwPiIRFV/MZKkEzrBg0wsc9bnLLoJmANuaDdK0XiQq0EvMb+Qiw 3MvUrvqd6YcqskwJeZ/A8ALM5feigndLcVf8NchQUoRgweCHaBofTB/Ma/Eu1CaR3FNf PsbfJfqM6IjvnIEA9VYF7xSaMuVf3ok6yEH+TXZo0PiveZTnI0+bIzU/TrZ4wlaGT7pj QRwJcz0cLobNP0/YX8tsGDGi/6QncY1UF8lWFqmF6QWakxjnBeEIDi+5iQVZrrpaR0YI FrljLh3rFHMWYOnyYhsH9qO45DcYkKvjg2idkt++IVayNBSRRPSuEM+C41z8nbDjcwLO RDwg== X-Gm-Message-State: ALoCoQkbZaqOoVqEd00NJzjwXo9TomauqfA+2t44JPcvFUYBnMWZHpNXKSOKrIZxyt0ozGK2ExWJ X-Received: by 10.68.223.34 with SMTP id qr2mr6409652pbc.140.1433948781624; Wed, 10 Jun 2015 08:06:21 -0700 (PDT) Received: from localhost.localdomain ([167.160.116.93]) by mx.google.com with ESMTPSA id w8sm2687917pbt.45.2015.06.10.08.06.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jun 2015 08:06:20 -0700 (PDT) From: Shannon Zhao To: qemu-devel@nongnu.org Date: Wed, 10 Jun 2015 23:04:36 +0800 Message-Id: <1433948676-14395-8-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.220.47 Cc: zhaoshenglong@huawei.com, shannon.zhao@linaro.org, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 7/7] vhost-scsi: move qdev properties into vhost-scsi.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 vhost-scsi.c uses DEFINE_VHOST_SCSI_PROPERTIES, there is no need to expose it. Inline it into vhost-scsi.c to avoid wrongly use. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Paolo Bonzini Acked-by: Cornelia Huck --- hw/scsi/vhost-scsi.c | 9 ++++++++- include/hw/virtio/vhost-scsi.h | 9 --------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 9c76486..1941aa1 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -294,7 +294,14 @@ static char *vhost_scsi_get_fw_dev_path(FWPathProvider *p, BusState *bus, } static Property vhost_scsi_properties[] = { - DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSI, parent_obj.conf), + DEFINE_PROP_STRING("vhostfd", VHostSCSI, parent_obj.conf.vhostfd), + DEFINE_PROP_STRING("wwpn", VHostSCSI, parent_obj.conf.wwpn), + DEFINE_PROP_UINT32("boot_tpgt", VHostSCSI, parent_obj.conf.boot_tpgt, 0), + DEFINE_PROP_UINT32("num_queues", VHostSCSI, parent_obj.conf.num_queues, 1), + DEFINE_PROP_UINT32("max_sectors", VHostSCSI, parent_obj.conf.max_sectors, + 0xFFFF), + DEFINE_PROP_UINT32("cmd_per_lun", VHostSCSI, parent_obj.conf.cmd_per_lun, + 128), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h index dea0075..701bfee 100644 --- a/include/hw/virtio/vhost-scsi.h +++ b/include/hw/virtio/vhost-scsi.h @@ -66,13 +66,4 @@ typedef struct VHostSCSI { int lun; } VHostSCSI; -#define DEFINE_VHOST_SCSI_PROPERTIES(_state, _conf_field) \ - DEFINE_PROP_STRING("vhostfd", _state, _conf_field.vhostfd), \ - DEFINE_PROP_STRING("wwpn", _state, _conf_field.wwpn), \ - DEFINE_PROP_UINT32("boot_tpgt", _state, _conf_field.boot_tpgt, 0), \ - DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1), \ - DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF), \ - DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128) - - #endif