Skip to content

Commit

Permalink
scsi-disk: support setting CD-ROM block size via device options
Browse files Browse the repository at this point in the history
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>
Message-Id: <20220804122950.1577012-1-john@john-millikin.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
jmillikin authored and bonzini committed Oct 10, 2022
1 parent f1d33f5 commit 298c31d
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion hw/scsi/scsi-disk.c
Expand Up @@ -2544,6 +2544,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
Expand All @@ -2553,9 +2554,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) {
Expand Down

0 comments on commit 298c31d

Please sign in to comment.