diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
commit | eb839909aa22069e04e1c910fcdf7feaa5581af6 (patch) | |
tree | dbe8648a2a0d7568109ba143e51ed40185e6cdda /hw/s390x/virtio-ccw.c | |
parent | 62e1aeaee4d0450222a0ea43c713b59526e3e0fe (diff) | |
parent | 8a7df84f9ff4342cae30f4e515e6ac82a0eb0bea (diff) |
Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
* 's390-for-upstream' of git://github.com/agraf/qemu:
s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
s390/css: Fix subchannel detection
Allow virtio-net features for legacy s390 virtio bus
s390: virtio-ccw maintainer
s390: simplify kvm cpu init
Diffstat (limited to 'hw/s390x/virtio-ccw.c')
-rw-r--r-- | hw/s390x/virtio-ccw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index d92e42735c..a9cf703d53 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -585,7 +585,6 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *dev) static int virtio_ccw_blk_exit(VirtioCcwDevice *dev) { virtio_blk_exit(dev->vdev); - blockdev_mark_auto_del(dev->blk.conf.bs); return virtio_ccw_exit(dev); } |