Re: [libvirt] [PATCH v2 31/32] qemu: Use the 'device_id' property of SCSI disks to avoid regressing

QEMU accidentally exposed the id of -drive (or same value as disk serial, if provided) in one of the identifiers visible from the guest. To avoid regression in case when -blockdev will be used we need to always specify it ourselves. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_command.c | 22 +++++++++++++++++++ .../controller-virtio-scsi.x86_64-latest.args | 20 ++++++++--------- .../disk-cache.x86_64-latest.args | 4 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 3 ++- .../disk-scsi.x86_64-latest.args | 16 ++++++++------ .../disk-shared.x86_64-latest.args | 5 +++-- ...threads-virtio-scsi-pci.x86_64-latest.args | 4 ++-- 7 files changed, 50 insertions(+), 24 deletions(-) @@ -2021,6 +2037,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.drive.target, disk->info.addr.drive.unit); } + + if (scsiVPDDeviceId) { + virBufferAddLit(&opt, ",device_id="); + virBufferEscape(&opt, '\\', " ", "%s", scsiVPDDeviceId);

+ } + break; case VIR_DOMAIN_DISK_BUS_SATA: