Re: [PATCH 06/12] scsi: remove AioContext locking
On Mon, Dec 04, 2023 at 01:23:09PM +0100, Kevin Wolf wrote:
> Am 29.11.2023 um 20:55 hat Stefan Hajnoczi geschrieben:
> > The AioContext lock no longer has any effect. Remove it.
> >
> > Signed-off-by: Stefan Hajnoczi
> > ---
> > include/hw/virtio/virtio-scsi.h | 14 --
> > hw/scsi/scsi-bus.c | 2 --
> > hw/scsi/scsi-disk.c | 28
> > hw/scsi/virtio-scsi.c | 18 --
> > 4 files changed, 4 insertions(+), 58 deletions(-)
>
> > @@ -2531,13 +2527,11 @@ static void scsi_unrealize(SCSIDevice *dev)
> > static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
> > {
> > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
> > -AioContext *ctx = NULL;
> > +
> > /* can happen for devices without drive. The error message for missing
> > * backend will be issued in scsi_realize
> > */
> > if (s->qdev.conf.blk) {
> > -ctx = blk_get_aio_context(s->qdev.conf.blk);
> > -aio_context_acquire(ctx);
> > if (!blkconf_blocksizes(&s->qdev.conf, errp)) {
> > goto out;
> > }
> > @@ -2549,15 +2543,11 @@ static void scsi_hd_realize(SCSIDevice *dev, Error
> > **errp)
> > }
> > scsi_realize(&s->qdev, errp);
> > out:
> > -if (ctx) {
> > -aio_context_release(ctx);
> > -}
> > }
>
> This doesn't build for me:
>
> ../hw/scsi/scsi-disk.c:2545:1: error: label at end of compound statement is a
> C2x extension [-Werror,-Wc2x-extensions]
> }
> ^
> 1 error generated.
Will fix in v2. Thanks!
Stefan
signature.asc
Description: PGP signature
Re: [PATCH 06/12] scsi: remove AioContext locking
Am 29.11.2023 um 20:55 hat Stefan Hajnoczi geschrieben:
> The AioContext lock no longer has any effect. Remove it.
>
> Signed-off-by: Stefan Hajnoczi
> ---
> include/hw/virtio/virtio-scsi.h | 14 --
> hw/scsi/scsi-bus.c | 2 --
> hw/scsi/scsi-disk.c | 28
> hw/scsi/virtio-scsi.c | 18 --
> 4 files changed, 4 insertions(+), 58 deletions(-)
> @@ -2531,13 +2527,11 @@ static void scsi_unrealize(SCSIDevice *dev)
> static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
> {
> SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
> -AioContext *ctx = NULL;
> +
> /* can happen for devices without drive. The error message for missing
> * backend will be issued in scsi_realize
> */
> if (s->qdev.conf.blk) {
> -ctx = blk_get_aio_context(s->qdev.conf.blk);
> -aio_context_acquire(ctx);
> if (!blkconf_blocksizes(&s->qdev.conf, errp)) {
> goto out;
> }
> @@ -2549,15 +2543,11 @@ static void scsi_hd_realize(SCSIDevice *dev, Error
> **errp)
> }
> scsi_realize(&s->qdev, errp);
> out:
> -if (ctx) {
> -aio_context_release(ctx);
> -}
> }
This doesn't build for me:
../hw/scsi/scsi-disk.c:2545:1: error: label at end of compound statement is a
C2x extension [-Werror,-Wc2x-extensions]
}
^
1 error generated.
Kevin
Re: [PATCH 06/12] scsi: remove AioContext locking
On Wed, Nov 29, 2023 at 02:55:47PM -0500, Stefan Hajnoczi wrote: > The AioContext lock no longer has any effect. Remove it. > > Signed-off-by: Stefan Hajnoczi > --- > include/hw/virtio/virtio-scsi.h | 14 -- > hw/scsi/scsi-bus.c | 2 -- > hw/scsi/scsi-disk.c | 28 > hw/scsi/virtio-scsi.c | 18 -- > 4 files changed, 4 insertions(+), 58 deletions(-) > Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org
