[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before blocking |
Date: |
Mon, 2 Mar 2015 11:08:52 +0100 |
From: Max Reitz <address@hidden>
s->blocker is really only used in hw/scsi/virtio-scsi.c; the only places
where it is used in hw/scsi/virtio-scsi-dataplane.c is when it is
allocated and when it is freed. That does not make a whole lot of sense
(and is actually wrong because this leads to s->blocker potentially
being NULL when blk_op_block_all() is called in virtio-scsi.c), so move
the allocation and destruction of s->blocker to the device realization
and unrealization in virtio-scsi.c, respectively.
Case in point:
$ echo -e 'eject drv\nquit' | \
x86_64-softmmu/qemu-system-x86_64 \
-monitor stdio -machine accel=qtest -display none \
-object iothread,id=thr -device virtio-scsi-pci,iothread=thr \
-drive if=none,file=test.qcow2,format=qcow2,id=drv \
-device scsi-cd,drive=drv
Without this patch:
(qemu) eject drv
[1] 10102 done
10103 segmentation fault (core dumped)
With this patch:
(qemu) eject drv
Device 'drv' is busy: block device is in use by data plane
(qemu) quit
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi-dataplane.c | 4 ----
hw/scsi/virtio-scsi.c | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index 418d73b..3f40ff0 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -211,8 +211,6 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s)
s->dataplane_starting = true;
- assert(!s->blocker);
- error_setg(&s->blocker, "block device is in use by data plane");
/* Set up guest notifier (irq) */
rc = k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, true);
if (rc != 0) {
@@ -279,8 +277,6 @@ void virtio_scsi_dataplane_stop(VirtIOSCSI *s)
if (!s->dataplane_started || s->dataplane_stopping) {
return;
}
- error_free(s->blocker);
- s->blocker = NULL;
s->dataplane_stopping = true;
assert(s->ctx == iothread_get_aio_context(vs->conf.iothread));
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 8c437dd..4db3b23 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -903,6 +903,8 @@ static void virtio_scsi_device_realize(DeviceState *dev,
Error **errp)
virtio_scsi_save, virtio_scsi_load, s);
s->migration_state_notifier.notify = virtio_scsi_migration_state_changed;
add_migration_state_change_notifier(&s->migration_state_notifier);
+
+ error_setg(&s->blocker, "block device is in use by data plane");
}
static void virtio_scsi_instance_init(Object *obj)
@@ -928,6 +930,8 @@ static void virtio_scsi_device_unrealize(DeviceState *dev,
Error **errp)
{
VirtIOSCSI *s = VIRTIO_SCSI(dev);
+ error_free(s->blocker);
+
unregister_savevm(dev, "virtio-scsi", s);
remove_migration_state_change_notifier(&s->migration_state_notifier);
--
2.3.0
- [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 02/15] block: Forbid bdrv_set_aio_context outside BQL, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 03/15] virtio-scsi-dataplane: Call blk_set_aio_context within BQL, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 04/15] timer: replace time() with QEMU_CLOCK_HOST, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd', Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 06/15] Add specific config options for PCI-E bridges, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 07/15] Create specific config option for "platform-bus", Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 08/15] Give ivshmem its own config option, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 01/15] scsi: give device a parent before setting properties, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 09/15] iscsi: Handle write protected case in reopen, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before blocking,
Paolo Bonzini <=
- [Qemu-devel] [PULL 10/15] Makefile: fix up parallel building under MSYS+MinGW, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 11/15] Makefile: don't silence mak file test with V=1, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 14/15] cpus: fix deadlock and segfault in qemu_mutex_lock_iothread, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 12/15] Makefile.target: binary depends on config-devices, Paolo Bonzini, 2015/03/02
- Re: [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Eric Blake, 2015/03/02
- Re: [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Peter Maydell, 2015/03/03