Re: [PATCH 3/3] qemu: command: add multi boot device support on s390x

On 11/7/24 15:53, Peter Krempa wrote: > On Wed, Nov 06, 2024 at 15:31:57 +0100, Boris Fiuczynski wrote: > > If QEMU supports multi boot device make use of it instead of using the > > single boot device machine parameter. > > > > Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com&gt; > > ---

OK, will do this here and also the other three similar instances. With fixups just like this: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cdc0ea18d7..f67176fbfd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1608,7 +1608,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, g_autofree char *chardev = NULL; g_autofree char *drive = NULL; unsigned int bootindex = 0; - g_autofree char *bootLoadparm = NULL; + const char *bootLoadparm = NULL; unsigned int logical_block_size = disk->blockio.logical_block_size; unsigned int physical_block_size = disk->blockio.physical_block_size; unsigned int discard_granularity = disk->blockio.discard_granularity; @@ -1750,9 +1750,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY) { bootindex = disk->info.effectiveBootIndex; - if (disk->info.loadparm && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) - bootLoadparm = g_strdup(disk->info.loadparm); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM)) + bootLoadparm = disk->info.loadparm; }