From de538266a69e3f6bf927cadc5230f7dcf1c8a70f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 21 Jul 2022 15:17:45 +0200 Subject: [PATCH] qemu: command: Delegate qemuBuildDriveStr to SD cards only MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the generic frontend-less -drive code from qemuBuildDriveStr by assuming that we support only blockdev-enabled qemus. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 75325a4da6..a8e2496521 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2039,17 +2039,7 @@ qemuBuildDriveStr(virDomainDiskDef *disk) if (qemuBuildDriveSourceStr(disk, &opt) < 0) return NULL; - if (!qemuDiskBusIsSD(disk->bus)) { - g_autofree char *drivealias = qemuAliasDiskDriveFromDisk(disk); - if (!drivealias) - return NULL; - - virBufferAddLit(&opt, "if=none"); - virBufferAsprintf(&opt, ",id=%s", drivealias); - } else { - virBufferAsprintf(&opt, "if=sd,index=%d", - virDiskNameToIndex(disk->dst)); - } + virBufferAsprintf(&opt, "if=sd,index=%d", virDiskNameToIndex(disk->dst)); if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=on"); @@ -2522,8 +2512,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd, if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk))) return -1; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) && - !qemuDiskBusIsSD(disk->bus)) { + } else if (!qemuDiskBusIsSD(disk->bus)) { if (virStorageSourceIsEmpty(disk->src)) return 0; -- 2.39.5