External/libvirt
1
0
Fork 0
Code

qemu: pass priv data to qemuBuildMasterKeyCommandLine

Browse Source 
Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-10-11 13:08:13 +02:00
parent ebf3abb166
commit 2dfef1240a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_command.c
View File

@ -201,8 +201,7 @@ qemuBuildHasMasterKey(virQEMUCapsPtr qemuCaps)
*/ */
static int static int
qemuBuildMasterKeyCommandLine(virCommandPtr cmd, qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
virQEMUCapsPtr qemuCaps, qemuDomainObjPrivatePtr priv)
const char *domainLibDir)
{ {
int ret = -1; int ret = -1;
char *alias = NULL; char *alias = NULL;
@ -213,7 +212,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
* means the domain won't be able to use a secret master key and is * means the domain won't be able to use a secret master key and is
* not a failure. * not a failure.
*/ */
if (!qemuBuildHasMasterKey(qemuCaps)) { if (!qemuBuildHasMasterKey(priv->qemuCaps)) {
VIR_INFO("secret object is not supported by this QEMU binary"); VIR_INFO("secret object is not supported by this QEMU binary");
return 0; return 0;
} }
@ -226,7 +225,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
* than other command line options which do not check for the * than other command line options which do not check for the
* existence of socket files before using. * existence of socket files before using.
*/ */
if (!(path = qemuDomainGetMasterKeyFilePath(domainLibDir))) if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir)))
goto cleanup; goto cleanup;
virCommandAddArg(cmd, "-object"); virCommandAddArg(cmd, "-object");
@ -9987,7 +9986,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
virQEMUCapsPtr qemuCaps = priv->qemuCaps; virQEMUCapsPtr qemuCaps = priv->qemuCaps;
virBitmapPtr nodeset = priv->autoNodeset; virBitmapPtr nodeset = priv->autoNodeset;
const char *domainLibDir = priv->libDir;
bool chardevStdioLogd = priv->chardevStdioLogd; bool chardevStdioLogd = priv->chardevStdioLogd;
VIR_DEBUG("driver=%p def=%p mon=%p json=%d " VIR_DEBUG("driver=%p def=%p mon=%p json=%d "
@ -10016,7 +10014,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (!standalone) if (!standalone)
virCommandAddArg(cmd, "-S"); /* freeze CPU */ virCommandAddArg(cmd, "-S"); /* freeze CPU */
if (qemuBuildMasterKeyCommandLine(cmd, qemuCaps, domainLibDir) < 0) if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0)
goto error; goto error;
if (enableFips) if (enableFips)