提交 4ef21ec1 编写于 作者: J Ján Tomko

Separate isa-fdc options generation

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.
上级 b792834a
...@@ -9784,18 +9784,25 @@ qemuBuildCommandLine(virConnectPtr conn, ...@@ -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) {
virCommandAddArg(cmd, "-global"); if (virAsprintf(&optstr, "bootindex%c=%d",
virCommandAddArgFormat(cmd, "isa-fdc.bootindex%c=%d",
disk->info.addr.drive.unit disk->info.addr.drive.unit
? 'B' : 'A', ? 'B' : 'A',
bootindex); bootindex) < 0)
goto error;
virCommandAddArg(cmd, "-global");
virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr);
VIR_FREE(optstr);
} }
} else { } else {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册