From patchwork Wed Mar 20 07:43:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 229259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C1A72C012C for ; Wed, 20 Mar 2013 18:44:17 +1100 (EST) Received: from localhost ([::1]:57348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIDh1-0005A1-Gn for incoming@patchwork.ozlabs.org; Wed, 20 Mar 2013 03:44:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIDgg-00058Z-Q6 for qemu-devel@nongnu.org; Wed, 20 Mar 2013 03:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIDgf-0002vD-H5 for qemu-devel@nongnu.org; Wed, 20 Mar 2013 03:43:54 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:60214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIDgf-0002te-9K for qemu-devel@nongnu.org; Wed, 20 Mar 2013 03:43:53 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Mar 2013 07:41:15 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 20 Mar 2013 07:41:12 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id DF6C01B0806E for ; Wed, 20 Mar 2013 07:43:47 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2K7hc2651118204 for ; Wed, 20 Mar 2013 07:43:38 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2K7hlU0024054 for ; Wed, 20 Mar 2013 01:43:47 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-122.boeblingen.de.ibm.com [9.152.224.122]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2K7hkxs024018; Wed, 20 Mar 2013 01:43:47 -0600 From: Cornelia Huck To: qemu-devel Date: Wed, 20 Mar 2013 08:43:45 +0100 Message-Id: <1363765425-5746-4-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363765425-5746-1-git-send-email-cornelia.huck@de.ibm.com> References: <1363765425-5746-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13032007-8372-0000-0000-0000057AAB34 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.108 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 3/3] virtio-ccw, s390-virtio: Use generic virtio-blk macro. 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 Now that virtio-ccw and s390-virtio define all common properties for virtio-blk, we can switch to using the generic DEFINE_VIRTIO_BLK_PROPERTIES macro. CC: Alexander Graf Signed-off-by: Cornelia Huck --- hw/s390x/s390-virtio-bus.c | 8 +------- hw/s390x/virtio-ccw.c | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 5d55a9d..c5d5456 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -435,13 +435,7 @@ static const TypeInfo s390_virtio_net = { }; static Property s390_virtio_blk_properties[] = { - DEFINE_BLOCK_PROPERTIES(VirtIOBlkS390, blk.conf), - DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkS390, blk.conf), - DEFINE_PROP_STRING("serial", VirtIOBlkS390, blk.serial), -#ifdef __linux__ - DEFINE_PROP_BIT("scsi", VirtIOBlkS390, blk.scsi, 0, true), -#endif - DEFINE_PROP_BIT("config-wce", VirtIOBlkS390, blk.config_wce, 0, true), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index afaf348..4c44b7e 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -756,14 +756,8 @@ static const TypeInfo virtio_ccw_net = { static Property virtio_ccw_blk_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), - DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf), - DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkCcw, blk.conf), - DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial), -#ifdef __linux__ - DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true), -#endif - DEFINE_PROP_BIT("config-wce", VirtIOBlkCcw, blk.config_wce, 0, true), DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk), DEFINE_PROP_END_OF_LIST(), };