| Message ID | 20220804122950.1577012-1-john@john-millikin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] scsi-disk: support setting CD-ROM block size via device options | expand |
Gentle ping On Thu, Aug 04, 2022 at 09:29:51PM +0900, John Millikin wrote: > SunOS expects CD-ROM devices to have a block size of 512, and will > fail to mount or install using QEMU's default block size of 2048. > > When initializing the SCSI device, allow the `physical_block_size' > block device option to override the default block size. > > Signed-off-by: John Millikin <john@john-millikin.com> > --- > hw/scsi/scsi-disk.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > This is the same diff as sent to qemu-devel@ about a week ago. That > first email seems to have been eaten by a grue, but replying to it > worked, so maybe the grue is gone now. > > See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some > related discussion about SunOS CD-ROM compatibility. > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index f5cdb9ad4b..acdf8dc05c 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp) > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); > AioContext *ctx; > int ret; > + uint32_t blocksize = 2048; > > if (!dev->conf.blk) { > /* Anonymous BlockBackend for an empty drive. As we put it into > @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp) > assert(ret == 0); > } > > + if (dev->conf.physical_block_size != 0) { > + blocksize = dev->conf.physical_block_size; > + } > + > ctx = blk_get_aio_context(dev->conf.blk); > aio_context_acquire(ctx); > - s->qdev.blocksize = 2048; > + s->qdev.blocksize = blocksize; > s->qdev.type = TYPE_ROM; > s->features |= 1 << SCSI_DISK_F_REMOVABLE; > if (!s->product) { > -- > 2.25.1 >
No, I had not seen it indeed. Queued now, thanks. Paolo Il gio 4 ago 2022, 14:39 John Millikin <john@john-millikin.com> ha scritto: > SunOS expects CD-ROM devices to have a block size of 512, and will > fail to mount or install using QEMU's default block size of 2048. > > When initializing the SCSI device, allow the `physical_block_size' > block device option to override the default block size. > > Signed-off-by: John Millikin <john@john-millikin.com> > --- > hw/scsi/scsi-disk.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > This is the same diff as sent to qemu-devel@ about a week ago. That > first email seems to have been eaten by a grue, but replying to it > worked, so maybe the grue is gone now. > > See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some > related discussion about SunOS CD-ROM compatibility. > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index f5cdb9ad4b..acdf8dc05c 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, Error > **errp) > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); > AioContext *ctx; > int ret; > + uint32_t blocksize = 2048; > > if (!dev->conf.blk) { > /* Anonymous BlockBackend for an empty drive. As we put it into > @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, Error > **errp) > assert(ret == 0); > } > > + if (dev->conf.physical_block_size != 0) { > + blocksize = dev->conf.physical_block_size; > + } > + > ctx = blk_get_aio_context(dev->conf.blk); > aio_context_acquire(ctx); > - s->qdev.blocksize = 2048; > + s->qdev.blocksize = blocksize; > s->qdev.type = TYPE_ROM; > s->features |= 1 << SCSI_DISK_F_REMOVABLE; > if (!s->product) { > -- > 2.25.1 > >
I notice this patch wasn't included in the [PULL] series last week, and it isn't present in the `master` branch. Is there anything else I should be doing to get it merged in? Sorry if this isn't a good question, I'm not used to QEMU's email-based change management workflow. On Sat, Aug 20, 2022 at 09:42:25AM +0200, Paolo Bonzini wrote: > No, I had not seen it indeed. Queued now, thanks. > > Paolo > > Il gio 4 ago 2022, 14:39 John Millikin <john@john-millikin.com> ha scritto: > > > SunOS expects CD-ROM devices to have a block size of 512, and will > > fail to mount or install using QEMU's default block size of 2048. > > > > When initializing the SCSI device, allow the `physical_block_size' > > block device option to override the default block size. > > > > Signed-off-by: John Millikin <john@john-millikin.com> > > --- > > hw/scsi/scsi-disk.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > This is the same diff as sent to qemu-devel@ about a week ago. That > > first email seems to have been eaten by a grue, but replying to it > > worked, so maybe the grue is gone now. > > > > See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some > > related discussion about SunOS CD-ROM compatibility. > > > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > > index f5cdb9ad4b..acdf8dc05c 100644 > > --- a/hw/scsi/scsi-disk.c > > +++ b/hw/scsi/scsi-disk.c > > @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, Error > > **errp) > > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); > > AioContext *ctx; > > int ret; > > + uint32_t blocksize = 2048; > > > > if (!dev->conf.blk) { > > /* Anonymous BlockBackend for an empty drive. As we put it into > > @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, Error > > **errp) > > assert(ret == 0); > > } > > > > + if (dev->conf.physical_block_size != 0) { > > + blocksize = dev->conf.physical_block_size; > > + } > > + > > ctx = blk_get_aio_context(dev->conf.blk); > > aio_context_acquire(ctx); > > - s->qdev.blocksize = 2048; > > + s->qdev.blocksize = blocksize; > > s->qdev.type = TYPE_ROM; > > s->features |= 1 << SCSI_DISK_F_REMOVABLE; > > if (!s->product) { > > -- > > 2.25.1 > > > >
Probably just my screw up, or it broke something when testing... let me check. Paolo Il lun 5 set 2022, 05:30 John Millikin <john@john-millikin.com> ha scritto: > I notice this patch wasn't included in the [PULL] series last week, and > it isn't present in the `master` branch. > > Is there anything else I should be doing to get it merged in? Sorry if > this isn't a good question, I'm not used to QEMU's email-based change > management workflow. > > On Sat, Aug 20, 2022 at 09:42:25AM +0200, Paolo Bonzini wrote: > > No, I had not seen it indeed. Queued now, thanks. > > > > Paolo > > > > Il gio 4 ago 2022, 14:39 John Millikin <john@john-millikin.com> ha > scritto: > > > > > SunOS expects CD-ROM devices to have a block size of 512, and will > > > fail to mount or install using QEMU's default block size of 2048. > > > > > > When initializing the SCSI device, allow the `physical_block_size' > > > block device option to override the default block size. > > > > > > Signed-off-by: John Millikin <john@john-millikin.com> > > > --- > > > hw/scsi/scsi-disk.c | 7 ++++++- > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > This is the same diff as sent to qemu-devel@ about a week ago. That > > > first email seems to have been eaten by a grue, but replying to it > > > worked, so maybe the grue is gone now. > > > > > > See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some > > > related discussion about SunOS CD-ROM compatibility. > > > > > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > > > index f5cdb9ad4b..acdf8dc05c 100644 > > > --- a/hw/scsi/scsi-disk.c > > > +++ b/hw/scsi/scsi-disk.c > > > @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, > Error > > > **errp) > > > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); > > > AioContext *ctx; > > > int ret; > > > + uint32_t blocksize = 2048; > > > > > > if (!dev->conf.blk) { > > > /* Anonymous BlockBackend for an empty drive. As we put it > into > > > @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, > Error > > > **errp) > > > assert(ret == 0); > > > } > > > > > > + if (dev->conf.physical_block_size != 0) { > > > + blocksize = dev->conf.physical_block_size; > > > + } > > > + > > > ctx = blk_get_aio_context(dev->conf.blk); > > > aio_context_acquire(ctx); > > > - s->qdev.blocksize = 2048; > > > + s->qdev.blocksize = blocksize; > > > s->qdev.type = TYPE_ROM; > > > s->features |= 1 << SCSI_DISK_F_REMOVABLE; > > > if (!s->product) { > > > -- > > > 2.25.1 > > > > > > > >
Gentle ping -- is there anything blocking this patch from going in? It's been about a month now since I sent it, and it's not very big, so I was hoping it would merge without much difficulty. If it's breaking a test or something then I'd be happy to take a look and send a new revision. On Mon, Sep 05, 2022 at 09:43:20AM +0200, Paolo Bonzini wrote: > Probably just my screw up, or it broke something when testing... let me > check. > > Paolo > > Il lun 5 set 2022, 05:30 John Millikin <john@john-millikin.com> ha scritto: > > > I notice this patch wasn't included in the [PULL] series last week, and > > it isn't present in the `master` branch. > > > > Is there anything else I should be doing to get it merged in? Sorry if > > this isn't a good question, I'm not used to QEMU's email-based change > > management workflow. > > > > On Sat, Aug 20, 2022 at 09:42:25AM +0200, Paolo Bonzini wrote: > > > No, I had not seen it indeed. Queued now, thanks. > > > > > > Paolo > > > > > > Il gio 4 ago 2022, 14:39 John Millikin <john@john-millikin.com> ha > > scritto: > > > > > > > SunOS expects CD-ROM devices to have a block size of 512, and will > > > > fail to mount or install using QEMU's default block size of 2048. > > > > > > > > When initializing the SCSI device, allow the `physical_block_size' > > > > block device option to override the default block size. > > > > > > > > Signed-off-by: John Millikin <john@john-millikin.com> > > > > --- > > > > hw/scsi/scsi-disk.c | 7 ++++++- > > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > > > This is the same diff as sent to qemu-devel@ about a week ago. That > > > > first email seems to have been eaten by a grue, but replying to it > > > > worked, so maybe the grue is gone now. > > > > > > > > See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some > > > > related discussion about SunOS CD-ROM compatibility. > > > > > > > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > > > > index f5cdb9ad4b..acdf8dc05c 100644 > > > > --- a/hw/scsi/scsi-disk.c > > > > +++ b/hw/scsi/scsi-disk.c > > > > @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, > > Error > > > > **errp) > > > > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); > > > > AioContext *ctx; > > > > int ret; > > > > + uint32_t blocksize = 2048; > > > > > > > > if (!dev->conf.blk) { > > > > /* Anonymous BlockBackend for an empty drive. As we put it > > into > > > > @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, > > Error > > > > **errp) > > > > assert(ret == 0); > > > > } > > > > > > > > + if (dev->conf.physical_block_size != 0) { > > > > + blocksize = dev->conf.physical_block_size; > > > > + } > > > > + > > > > ctx = blk_get_aio_context(dev->conf.blk); > > > > aio_context_acquire(ctx); > > > > - s->qdev.blocksize = 2048; > > > > + s->qdev.blocksize = blocksize; > > > > s->qdev.type = TYPE_ROM; > > > > s->features |= 1 << SCSI_DISK_F_REMOVABLE; > > > > if (!s->product) { > > > > -- > > > > 2.25.1 > > > > > > > > > > > >
Gentle ping again. I'd really like to get this ~6 line patch into mainline so I can pop it off my TODO list. On Mon, Sep 12, 2022 at 04:54:52PM +0900, John Millikin wrote: > Gentle ping -- is there anything blocking this patch from going in? > > It's been about a month now since I sent it, and it's not very big, so I > was hoping it would merge without much difficulty. > > If it's breaking a test or something then I'd be happy to take a look > and send a new revision. > > On Mon, Sep 05, 2022 at 09:43:20AM +0200, Paolo Bonzini wrote: > > Probably just my screw up, or it broke something when testing... let me > > check. > > > > Paolo > > > > Il lun 5 set 2022, 05:30 John Millikin <john@john-millikin.com> ha scritto: > > > > > I notice this patch wasn't included in the [PULL] series last week, and > > > it isn't present in the `master` branch. > > > > > > Is there anything else I should be doing to get it merged in? Sorry if > > > this isn't a good question, I'm not used to QEMU's email-based change > > > management workflow. > > > > > > On Sat, Aug 20, 2022 at 09:42:25AM +0200, Paolo Bonzini wrote: > > > > No, I had not seen it indeed. Queued now, thanks. > > > > > > > > Paolo > > > >
Queued, thanks. Sorry for the delay. Paolo
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f5cdb9ad4b..acdf8dc05c 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2533,6 +2533,7 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); AioContext *ctx; int ret; + uint32_t blocksize = 2048; if (!dev->conf.blk) { /* Anonymous BlockBackend for an empty drive. As we put it into @@ -2542,9 +2543,13 @@ static void scsi_cd_realize(SCSIDevice *dev, Error **errp) assert(ret == 0); } + if (dev->conf.physical_block_size != 0) { + blocksize = dev->conf.physical_block_size; + } + ctx = blk_get_aio_context(dev->conf.blk); aio_context_acquire(ctx); - s->qdev.blocksize = 2048; + s->qdev.blocksize = blocksize; s->qdev.type = TYPE_ROM; s->features |= 1 << SCSI_DISK_F_REMOVABLE; if (!s->product) {
SunOS expects CD-ROM devices to have a block size of 512, and will fail to mount or install using QEMU's default block size of 2048. When initializing the SCSI device, allow the `physical_block_size' block device option to override the default block size. Signed-off-by: John Millikin <john@john-millikin.com> --- hw/scsi/scsi-disk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) This is the same diff as sent to qemu-devel@ about a week ago. That first email seems to have been eaten by a grue, but replying to it worked, so maybe the grue is gone now. See https://gitlab.com/qemu-project/qemu/-/issues/1127 for some related discussion about SunOS CD-ROM compatibility.