mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
qemuProcessCreatePretendCmd: Rework FIPS handling
This function - in contrast with qemuBuildCommandLine - merely constructs our internal command representation of a domain. This is then later compared against expected output. Or, this function is used also in virConnectDomainXMLToNative(). But due to a copy paste error this function, just like its image - has @forceFips argument that if enabled forces FIPS, otherwise mimics FIPS state in the host. If FIPS is enabled or forced the generated command line is different to state in which FIPS is disabled. Problem is, while this could be desired in the virConnectDomainXMLToNative() case, this is undesirable in the test suite as it will produce unpredicted results. Solution to this is to rename argument to @enableFips to specifically tell whether we expect command line to be build in either of fashions and make virConnectDomainXMLToNative() implementation fetch FIPS state and pass it to qemuProcessCreatePretendCmd(). Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
ff2126225d
commit
927d047ee7
@ -7060,7 +7060,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
|
||||
}
|
||||
}
|
||||
|
||||
if (!(cmd = qemuProcessCreatePretendCmd(conn, driver, vm, NULL, false, true,
|
||||
if (!(cmd = qemuProcessCreatePretendCmd(conn, driver, vm, NULL,
|
||||
qemuCheckFips(), true,
|
||||
VIR_QEMU_PROCESS_START_COLD)))
|
||||
goto cleanup;
|
||||
|
||||
|
@ -5715,7 +5715,7 @@ qemuProcessCreatePretendCmd(virConnectPtr conn,
|
||||
virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm,
|
||||
const char *migrateURI,
|
||||
bool forceFips,
|
||||
bool enableFips,
|
||||
bool standalone,
|
||||
unsigned int flags)
|
||||
{
|
||||
@ -5747,7 +5747,7 @@ qemuProcessCreatePretendCmd(virConnectPtr conn,
|
||||
NULL,
|
||||
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
|
||||
standalone,
|
||||
forceFips ? true : qemuCheckFips(),
|
||||
enableFips,
|
||||
priv->autoNodeset,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -85,7 +85,7 @@ virCommandPtr qemuProcessCreatePretendCmd(virConnectPtr conn,
|
||||
virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm,
|
||||
const char *migrateURI,
|
||||
bool forceFips,
|
||||
bool enableFips,
|
||||
bool standalone,
|
||||
unsigned int flags);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user