From patchwork Mon Jan 2 17:59:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 133901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D90DB6F67 for ; Tue, 3 Jan 2012 05:41:12 +1100 (EST) Received: from localhost ([::1]:34054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmC9-0000gu-F5 for incoming@patchwork.ozlabs.org; Mon, 02 Jan 2012 13:01:13 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB5-0007Fn-1L for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhmB0-0000yy-Nw for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:06 -0500 Received: from mail-yw0-f45.google.com ([209.85.213.45]:51180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmB0-0000l6-H8 for qemu-devel@nongnu.org; Mon, 02 Jan 2012 13:00:02 -0500 Received: by mail-yw0-f45.google.com with SMTP id g71so10818606yhg.4 for ; Mon, 02 Jan 2012 10:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=5JkrhHiFjsUZnQbCShF8nbScvbma2P1UTfe9k7TGEYs=; b=ByessX/ordEEgoxCZzUMsoHgg6tYa4DWcjfK9qH51zvaCXJVXDSPIP7OMlVWlPf7Mn TSmo1At3VyMpVcIP58Vr104r3BkBFdBjPjXfThWMTxknPREeJ4qFJCtn+YZlCVA06wVc sKtjJ+opurN+DsahmOk+jq6SzPRubwcc1vYsY= Received: by 10.236.161.103 with SMTP id v67mr62786391yhk.87.1325527201752; Mon, 02 Jan 2012 10:00:01 -0800 (PST) Received: from localhost.localdomain (host167-160-dynamic.2-87-r.retail.telecomitalia.it. [87.2.160.167]) by mx.google.com with ESMTPS id n64sm70043957yhk.4.2012.01.02.09.59.59 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 10:00:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Jan 2012 18:59:20 +0100 Message-Id: <1325527166-23898-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> References: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.45 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH v2 09/15] virtio-blk: move BlockConf into VirtIOBlkConf 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 Also call blockdev_mark_auto_del from virtio_blk_exit, rather than just virtio_blk_exit_pci. Signed-off-by: Paolo Bonzini --- hw/s390-virtio-bus.c | 4 +--- hw/s390-virtio-bus.h | 1 - hw/virtio-blk.c | 17 +++++++++-------- hw/virtio-blk.h | 2 ++ hw/virtio-pci.c | 5 +---- hw/virtio-pci.h | 1 - hw/virtio.h | 3 +-- 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 71720b9..a3810f2 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -128,8 +128,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *dev) { VirtIODevice *vdev; - vdev = virtio_blk_init((DeviceState *)dev, &dev->block, - &dev->blk); + vdev = virtio_blk_init((DeviceState *)dev, &dev->blk); if (!vdev) { return -1; } @@ -347,7 +346,6 @@ static VirtIOS390DeviceInfo s390_virtio_blk = { .qdev.alias = "virtio-blk", .qdev.size = sizeof(VirtIOS390Device), .qdev.props = (Property[]) { - DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, block), DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOS390Device, host_features, blk), DEFINE_PROP_END_OF_LIST(), }, diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 1f47e4d..414fd22 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -42,7 +42,6 @@ typedef struct VirtIOS390Device { ram_addr_t feat_offs; uint8_t feat_len; VirtIODevice *vdev; - BlockConf block; VirtIOBlkConf blk; uint32_t host_features; virtio_serial_conf serial; diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 6ad5c4d..3d5caeb 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -566,25 +566,25 @@ static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, }; -VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, VirtIOBlkConf *blk) +VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) { VirtIOBlock *s; int cylinders, heads, secs; static int virtio_blk_id; DriveInfo *dinfo; - if (!conf->bs) { + if (!blk->conf.bs) { error_report("virtio-blk-pci: drive property not set"); return NULL; } - if (!bdrv_is_inserted(conf->bs)) { + if (!bdrv_is_inserted(blk->conf.bs)) { error_report("Device needs media, but drive is empty"); return NULL; } if (!blk->serial) { /* try to fall back to value set with legacy -drive serial=... */ - dinfo = drive_get_by_blockdev(conf->bs); + dinfo = drive_get_by_blockdev(blk->conf.bs); if (*dinfo->serial) { blk->serial = strdup(dinfo->serial); } @@ -597,8 +597,8 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, VirtIOBlkConf * s->vdev.get_config = virtio_blk_update_config; s->vdev.get_features = virtio_blk_get_features; s->vdev.reset = virtio_blk_reset; - s->bs = conf->bs; - s->conf = conf; + s->bs = blk->conf.bs; + s->conf = &blk->conf; s->blk = blk; s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; @@ -611,10 +611,10 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, VirtIOBlkConf * register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, s); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); - bdrv_set_buffer_alignment(s->bs, conf->logical_block_size); + bdrv_set_buffer_alignment(s->bs, s->conf->logical_block_size); bdrv_iostatus_enable(s->bs); - add_boot_device_path(conf->bootindex, dev, "/disk@0,0"); + add_boot_device_path(s->conf->bootindex, dev, "/disk@0,0"); return &s->vdev; } @@ -623,5 +623,6 @@ void virtio_blk_exit(VirtIODevice *vdev) { VirtIOBlock *s = to_virtio_blk(vdev); unregister_savevm(s->qdev, "virtio-blk", s); + blockdev_mark_auto_del(s->bs); virtio_cleanup(vdev); } diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index dd26ae7..518e1cc 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -99,6 +99,7 @@ struct virtio_scsi_inhdr struct VirtIOBlkConf { + BlockConf conf; char *serial; }; @@ -113,6 +114,7 @@ struct VirtIOBlkConf #define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _features_field, _conf_field) \ DEFINE_VIRTIO_BLK_FEATURES(_state, _features_field), \ + DEFINE_BLOCK_PROPERTIES(_state, _conf_field.conf), \ DEFINE_PROP_STRING("serial", _state, _conf_field.serial) #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index a91fc68..e189307 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -670,8 +670,7 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev) proxy->class_code != PCI_CLASS_STORAGE_OTHER) proxy->class_code = PCI_CLASS_STORAGE_SCSI; - vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block, - &proxy->blk); + vdev = virtio_blk_init(&pci_dev->qdev, &proxy->blk); if (!vdev) { return -1; } @@ -699,7 +698,6 @@ static int virtio_blk_exit_pci(PCIDevice *pci_dev) virtio_pci_stop_ioeventfd(proxy); virtio_blk_exit(proxy->vdev); - blockdev_mark_auto_del(proxy->block.bs); return virtio_exit_pci(pci_dev); } @@ -808,7 +806,6 @@ static PCIDeviceInfo virtio_info[] = { .class_id = PCI_CLASS_STORAGE_SCSI, .qdev.props = (Property[]) { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), - DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, block), DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index dde687d..a10df5a 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -33,7 +33,6 @@ typedef struct { uint32_t flags; uint32_t class_code; uint32_t nvectors; - BlockConf block; VirtIOBlkConf blk; uint32_t host_features; #ifdef CONFIG_VIRTFS diff --git a/hw/virtio.h b/hw/virtio.h index f483fe2..1bbfee6 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -192,8 +192,7 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, /* Base devices. */ typedef struct VirtIOBlkConf VirtIOBlkConf; -VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, - VirtIOBlkConf *blk); +VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk); struct virtio_net_conf; VirtIODevice *virtio_net_init(DeviceState *dev, struct virtio_net_conf *net); typedef struct virtio_serial_conf virtio_serial_conf;