External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuBuildFloppyCommandLineControllerOptionsExplicit: Generate via JSON

Browse Source 
QEMU declares the bootindex types as:

  bootindexA=<int32>
  bootindexB=<int32>

The driveA/driveB parameters were deprecated and removed in qemu-6.0.
We'll keep them for compatibility, but they are not used with -blockdev.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-11 21:45:25 +02:00
parent 245e8a12fd
commit 926864ba45
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/qemu/qemu_command.c
View File

@ -2183,32 +2183,29 @@ qemuBuildFloppyCommandLineControllerOptionsImplicit(virCommand *cmd,
}
static void
static int
qemuBuildFloppyCommandLineControllerOptionsExplicit(virCommand *cmd,
unsigned int bootindexA,
unsigned int bootindexB,
const char *backendA,
const char *backendB)
const char *backendB,
virQEMUCaps *qemuCaps)
{
g_auto(virBuffer) fdc_opts = VIR_BUFFER_INITIALIZER;
g_autoptr(virJSONValue) props = NULL;
virBufferAddLit(&fdc_opts, "isa-fdc,");
if (virJSONValueObjectCreate(&props,
"s:driver", "isa-fdc",
"S:driveA", backendA,
"p:bootindexA", bootindexA,
"S:driveB", backendB,
"p:bootindexB", bootindexB,
NULL) < 0)
return -1;
if (backendA)
virBufferAsprintf(&fdc_opts, "driveA=%s,", backendA);
if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0)
return -1;
if (bootindexA > 0)
virBufferAsprintf(&fdc_opts, "bootindexA=%u,", bootindexA);
if (backendB)
virBufferAsprintf(&fdc_opts, "driveB=%s,", backendB);
if (bootindexB > 0)
virBufferAsprintf(&fdc_opts, "bootindexB=%u,", bootindexB);
virBufferTrim(&fdc_opts, ",");
virCommandAddArg(cmd, "-device");
virCommandAddArgBuffer(cmd, &fdc_opts);
return 0;
}
@ -2251,11 +2248,13 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,
return 0;
if (qemuDomainNeedsFDC(def)) {
qemuBuildFloppyCommandLineControllerOptionsExplicit(cmd,
bootindexA,
bootindexB,
backendA,
backendB);
if (qemuBuildFloppyCommandLineControllerOptionsExplicit(cmd,
bootindexA,
bootindexB,
backendA,
backendB,
qemuCaps) < 0)
return -1;
} else {
qemuBuildFloppyCommandLineControllerOptionsImplicit(cmd,
bootindexA,