External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 07:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate isa-fdc options generation

Browse Source 
For the implicit controller, we set them via -global.
Separating them will allow reuse for explicit fdc controller as well.

No functional impact apart from one extra allocation.
This commit is contained in:
Ján Tomko 2015-06-22 15:20:34 +02:00
parent b792834a41
commit 4ef21ec192
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_command.c
View File

@ -9784,18 +9784,25 @@ qemuBuildCommandLine(virConnectPtr conn,
if (withDeviceArg) { if (withDeviceArg) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {
if (virAsprintf(&optstr, "drive%c=drive-%s",
disk->info.addr.drive.unit ? 'B' : 'A',
disk->info.alias) < 0)
goto error;
virCommandAddArg(cmd, "-global"); virCommandAddArg(cmd, "-global");
virCommandAddArgFormat(cmd, "isa-fdc.drive%c=drive-%s", virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr);
disk->info.addr.drive.unit VIR_FREE(optstr);
? 'B' : 'A',
disk->info.alias);
if (bootindex) { if (bootindex) {
if (virAsprintf(&optstr, "bootindex%c=%d",
disk->info.addr.drive.unit
? 'B' : 'A',
bootindex) < 0)
goto error;
virCommandAddArg(cmd, "-global"); virCommandAddArg(cmd, "-global");
virCommandAddArgFormat(cmd, "isa-fdc.bootindex%c=%d", virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr);
disk->info.addr.drive.unit VIR_FREE(optstr);
? 'B' : 'A',
bootindex);
} }
} else { } else {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");