On 10/23/2014 04:32 PM, Peter Maydell wrote:
> On 23 October 2014 14:33, Paolo Bonzini <pbonz...@redhat.com> wrote:
>> The following changes since commit 5f77ef69a195098baddfdc6d189f1b4a94587378:
>>
>> glib: add compatibility interface for g_strcmp0() (2014-10-16 23:02:31
>> +0100)
>>
>> are available in the git repository at:
>>
>> git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to 6dad2b7b17ddfeb8276d2e359cb2383a8ae98d37:
>>
>> get_maintainer.pl: restrict cases where it falls back to --git (2014-10-22
>> 15:56:34 +0200)
>>
>> ----------------------------------------------------------------
>> virtio-scsi-dataplane fixes and the first part of dynamic sysbus devices
>> Also MAINTAINERS updates, they are fancy these days. :)
>>
>> ----------------------------------------------------------------
>
> Hi. I'm afraid this doesn't compile:
>
> /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c: In
> function ‘virtio_scsi_hotplug’:
> /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:749:40:
> error: ‘BlockConf’ has no member named ‘bs’
> if (bdrv_op_is_blocked(sd->conf.bs, BLOCK_OP_TYPE_DATAPLANE, errp)) {
> ^
> /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:752:35:
> error: ‘BlockConf’ has no member named ‘bs’
> bdrv_op_block_all(sd->conf.bs, s->blocker);
> ^
> /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c: In
> function ‘virtio_scsi_hotunplug’:
> /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:776:37:
> error: ‘BlockConf’ has no member named ‘bs’
> bdrv_op_unblock_all(sd->conf.bs, s->blocker);
> ^
> make[1]: *** [hw/scsi/virtio-scsi.o] Error 1
Semantic conflict:
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 3f540ad..2d2612b 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -746,10 +746,10 @@ static void virtio_scsi_hotplug(HotplugHandler
*hotplug_dev, DeviceState *dev,
SCSIDevice *sd = SCSI_DEVICE(dev);
if (s->ctx && !s->dataplane_disabled) {
- if (bdrv_op_is_blocked(sd->conf.bs, BLOCK_OP_TYPE_DATAPLANE, errp)) {
+ if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) {
return;
}
- bdrv_op_block_all(sd->conf.bs, s->blocker);
+ blk_op_block_all(sd->conf.blk, s->blocker);
}
if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) {
@@ -773,7 +773,7 @@ static void virtio_scsi_hotunplug(HotplugHandler
*hotplug_dev, DeviceState *dev,
}
if (s->ctx) {
- bdrv_op_unblock_all(sd->conf.bs, s->blocker);
+ blk_op_unblock_all(sd->conf.blk, s->blocker);
}
qdev_simple_device_unplug_cb(hotplug_dev, dev, errp);
}
will send v2.
Paolo
