From patchwork Fri Apr 5 13:28:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 234134 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 7F9152C00AC for ; Sat, 6 Apr 2013 00:30:42 +1100 (EST) Received: from localhost ([::1]:57234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO6j2-0006fM-Nn for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 09:30:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO6gp-0003Xh-1p for qemu-devel@nongnu.org; Fri, 05 Apr 2013 09:28:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO6gn-0007xU-Aj for qemu-devel@nongnu.org; Fri, 05 Apr 2013 09:28:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO6gn-0007xI-2i for qemu-devel@nongnu.org; Fri, 05 Apr 2013 09:28:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r35DSJO1019213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Apr 2013 09:28:19 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r35DSG3l003635; Fri, 5 Apr 2013 09:28:18 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 5 Apr 2013 15:28:03 +0200 Message-Id: <1365168490-29616-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1365168490-29616-1-git-send-email-kwolf@redhat.com> References: <1365168490-29616-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/8] virtio-blk-x: fix configuration synchronization. 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 From: KONRAD Frederic The virtio-blk-x configuration is not in sync with virtio-blk configuration. So this patch remove the virtio-blk-x configuration field, and use virtio-blk one for setting the properties. This also remove a useless configuration copy in virtio_blk_device_init. Signed-off-by: KONRAD Frederic Tested-by: Cornelia Huck Signed-off-by: Kevin Wolf --- hw/s390x/s390-virtio-bus.c | 4 ++-- hw/s390x/s390-virtio-bus.h | 1 - hw/s390x/virtio-ccw.c | 4 ++-- hw/s390x/virtio-ccw.h | 1 - hw/virtio-blk.c | 7 ------- hw/virtio-blk.h | 2 -- hw/virtio-pci.c | 7 ++++--- hw/virtio-pci.h | 1 - 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 8c529c1..3824181 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -166,7 +166,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *s390_dev) { VirtIOBlkS390 *dev = VIRTIO_BLK_S390(s390_dev); DeviceState *vdev = DEVICE(&dev->vdev); - virtio_blk_set_conf(vdev, &(dev->blk)); + qdev_set_parent_bus(vdev, BUS(&s390_dev->bus)); if (qdev_init(vdev) < 0) { return -1; @@ -443,7 +443,7 @@ static const TypeInfo s390_virtio_net = { }; static Property s390_virtio_blk_properties[] = { - DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, vdev.blk), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index ebe8794..06f9479 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -127,7 +127,6 @@ void s390_virtio_reset_idx(VirtIOS390Device *dev); typedef struct VirtIOBlkS390 { VirtIOS390Device parent_obj; VirtIOBlock vdev; - VirtIOBlkConf blk; } VirtIOBlkS390; /* virtio-scsi-s390 */ diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 5dce791..78a8f0e 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -574,7 +574,7 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev) { VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(ccw_dev); DeviceState *vdev = DEVICE(&dev->vdev); - virtio_blk_set_conf(vdev, &(dev->blk)); + qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); if (qdev_init(vdev) < 0) { return -1; @@ -761,7 +761,7 @@ static const TypeInfo virtio_ccw_net = { static Property virtio_ccw_blk_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]), - DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, vdev.blk), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index d580510..5179374 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -113,7 +113,6 @@ typedef struct VirtIOSCSICcw { typedef struct VirtIOBlkCcw { VirtioCcwDevice parent_obj; VirtIOBlock vdev; - VirtIOBlkConf blk; } VirtIOBlkCcw; /* virtio-balloon-ccw */ diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f2143fd..0414a8a 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -619,12 +619,6 @@ static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, }; -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk) -{ - VirtIOBlock *s = VIRTIO_BLK(dev); - memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); -} - static int virtio_blk_device_init(VirtIODevice *vdev) { DeviceState *qdev = DEVICE(vdev); @@ -656,7 +650,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev) vdev->reset = virtio_blk_reset; s->bs = blk->conf.bs; s->conf = &blk->conf; - memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 8c6c78b..e228057 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -148,6 +148,4 @@ typedef struct VirtIOBlock { DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true) #endif /* __linux__ */ -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); - #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index fb20722..fbcc5f6 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -1303,10 +1303,11 @@ static Property virtio_blk_pci_properties[] = { VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE - DEFINE_PROP_BIT("x-data-plane", VirtIOBlkPCI, blk.data_plane, 0, false), + DEFINE_PROP_BIT("x-data-plane", VirtIOBlkPCI, vdev.blk.data_plane, 0, + false), #endif DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features), - DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkPCI, blk), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkPCI, vdev.blk), DEFINE_PROP_END_OF_LIST(), }; @@ -1314,7 +1315,7 @@ static int virtio_blk_pci_init(VirtIOPCIProxy *vpci_dev) { VirtIOBlkPCI *dev = VIRTIO_BLK_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); - virtio_blk_set_conf(vdev, &(dev->blk)); + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); if (qdev_init(vdev) < 0) { return -1; diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index f99f2eb..108ed12 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -115,7 +115,6 @@ struct VirtIOSCSIPCI { struct VirtIOBlkPCI { VirtIOPCIProxy parent_obj; VirtIOBlock vdev; - VirtIOBlkConf blk; }; /*