From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhJYD-0001ZY-WF for qemu-devel@nongnu.org; Thu, 23 Oct 2014 10:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhJY8-0000Mw-3O for qemu-devel@nongnu.org; Thu, 23 Oct 2014 10:39:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhJY7-0000Mo-SO for qemu-devel@nongnu.org; Thu, 23 Oct 2014 10:39:36 -0400 Message-ID: <5449131E.4010805@redhat.com> Date: Thu, 23 Oct 2014 16:39:26 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1414071252-7003-1-git-send-email-pbonzini@redhat.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 00/24] SCSI, maintainers and more - 2014-10-17 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers On 10/23/2014 04:32 PM, Peter Maydell wrote: > On 23 October 2014 14:33, Paolo Bonzini wrote: >> The following changes since commit 5f77ef69a195098baddfdc6d189f1b4a945= 87378: >> >> 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 6dad2b7b17ddfeb8276d2e359cb2383a8ae98d3= 7: >> >> 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 devic= es >> Also MAINTAINERS updates, they are fancy these days. :) >> >> ---------------------------------------------------------------- >=20 > Hi. I'm afraid this doesn't compile: >=20 > /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c: In > function =E2=80=98virtio_scsi_hotplug=E2=80=99: > /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:749:40: > error: =E2=80=98BlockConf=E2=80=99 has no member named =E2=80=98bs=E2=80= =99 > if (bdrv_op_is_blocked(sd->conf.bs, BLOCK_OP_TYPE_DATAPLANE, e= rrp)) { > ^ > /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:752:35: > error: =E2=80=98BlockConf=E2=80=99 has no member named =E2=80=98bs=E2=80= =99 > bdrv_op_block_all(sd->conf.bs, s->blocker); > ^ > /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c: In > function =E2=80=98virtio_scsi_hotunplug=E2=80=99: > /home/petmay01/linaro/qemu-for-merges/hw/scsi/virtio-scsi.c:776:37: > error: =E2=80=98BlockConf=E2=80=99 has no member named =E2=80=98bs=E2=80= =99 > 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 *hot= plug_dev, DeviceState *dev, SCSIDevice *sd =3D SCSI_DEVICE(dev); =20 if (s->ctx && !s->dataplane_disabled) { - if (bdrv_op_is_blocked(sd->conf.bs, BLOCK_OP_TYPE_DATAPLANE, err= p)) { + if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, err= p)) { return; } - bdrv_op_block_all(sd->conf.bs, s->blocker); + blk_op_block_all(sd->conf.blk, s->blocker); } =20 if ((vdev->guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) { @@ -773,7 +773,7 @@ static void virtio_scsi_hotunplug(HotplugHandler *hot= plug_dev, DeviceState *dev, } =20 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