From 6236b61443fb4e8f79c0297f7daf45f7ba99423e Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 25 Jun 2018 08:59:37 +0200 Subject: [PATCH] qemu: command: Don't generate disk drive alias manually for floppies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemuBulildFloppyCommandLineOptions built its own version of the -drive alias. Replace it by qemuAliasDiskDriveFromDisk. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1c162603e5..2fe13287e2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2150,12 +2150,17 @@ qemuBuildFloppyCommandLineOptions(virCommandPtr cmd, virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; char *fdc_opts_str = NULL; char *optstr; + char *backendAlias = NULL; + int ret = -1; - if (virAsprintf(&optstr, "drive%c=drive-%s", - disk->info.addr.drive.unit ? 'B' : 'A', - disk->info.alias) < 0) + if (!(backendAlias = qemuAliasDiskDriveFromDisk(disk))) return -1; + if (virAsprintf(&optstr, "drive%c=%s", + disk->info.addr.drive.unit ? 'B' : 'A', + backendAlias) < 0) + goto cleanup; + if (!qemuDomainNeedsFDC(def)) { virCommandAddArg(cmd, "-global"); virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); @@ -2169,7 +2174,7 @@ qemuBuildFloppyCommandLineOptions(virCommandPtr cmd, disk->info.addr.drive.unit ? 'B' : 'A', bootindex) < 0) - return -1; + goto cleanup; if (!qemuDomainNeedsFDC(def)) { virCommandAddArg(cmd, "-global"); @@ -2188,7 +2193,11 @@ qemuBuildFloppyCommandLineOptions(virCommandPtr cmd, VIR_FREE(fdc_opts_str); } - return 0; + ret = 0; + + cleanup: + VIR_FREE(backendAlias); + return ret; }