External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-15 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: re-introduce qemuBuildFSDevCommandLine

Browse Source 
This time it only builds one device.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2019-07-16 10:35:44 +02:00
parent d8f8f1d172
commit da0f5aab3e
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/qemu/qemu_command.c
View File

@ -2801,6 +2801,33 @@ qemuBuildFSDevStr(const virDomainDef *def,
} }
static int
qemuBuildFSDevCommandLine(virCommandPtr cmd,
virDomainFSDefPtr fs,
const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{
char *optstr;
virCommandAddArg(cmd, "-fsdev");
if (!(optstr = qemuBuildFSStr(fs)))
return -1;
virCommandAddArg(cmd, optstr);
VIR_FREE(optstr);
if (qemuCommandAddExtDevice(cmd, &fs->info) < 0)
return -1;
virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
return -1;
virCommandAddArg(cmd, optstr);
VIR_FREE(optstr);
return 0;
}
static int static int
qemuBuildFilesystemCommandLine(virCommandPtr cmd, qemuBuildFilesystemCommandLine(virCommandPtr cmd,
const virDomainDef *def, const virDomainDef *def,
@ -2809,23 +2836,8 @@ qemuBuildFilesystemCommandLine(virCommandPtr cmd,
size_t i; size_t i;
for (i = 0; i < def->nfss; i++) { for (i = 0; i < def->nfss; i++) {
char *optstr; if (qemuBuildFSDevCommandLine(cmd, def->fss[i], def, qemuCaps) < 0)
virDomainFSDefPtr fs = def->fss[i];
virCommandAddArg(cmd, "-fsdev");
if (!(optstr = qemuBuildFSStr(fs)))
return -1; return -1;
virCommandAddArg(cmd, optstr);
VIR_FREE(optstr);
if (qemuCommandAddExtDevice(cmd, &fs->info) < 0)
return -1;
virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
return -1;
virCommandAddArg(cmd, optstr);
VIR_FREE(optstr);
} }
return 0; return 0;