NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildTLSx509BackendProps: Remove unused 'qemuCaps'

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-23 15:51:21 +02:00
parent 62b019c0fe
commit 33ebfe3756
8 changed files with 31 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_backup.c
View File

@ -323,8 +323,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm,
/* use original disk as backing to prevent opening the backing chain */ /* use original disk as backing to prevent opening the backing chain */
if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->store, if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->store,
dd->backingStore, dd->backingStore)))
priv->qemuCaps)))
return -1; return -1;
return 0; return 0;
@ -728,7 +727,7 @@ qemuBackupBeginPrepareTLS(virDomainObj *vm,
if (qemuBuildTLSx509BackendProps(cfg->backupTLSx509certdir, true, if (qemuBuildTLSx509BackendProps(cfg->backupTLSx509certdir, true,
cfg->backupTLSx509verify, tlsObjAlias, cfg->backupTLSx509verify, tlsObjAlias,
tlsKeySecretAlias, priv->qemuCaps, tlsKeySecretAlias,
tlsProps) < 0) tlsProps) < 0)
return -1; return -1;

39
src/qemu/qemu_command.c
View File

@ -754,7 +754,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
* @verifypeer: boolean to enable peer verification (form of authorization) * @verifypeer: boolean to enable peer verification (form of authorization)
* @alias: alias for the TLS credentials object * @alias: alias for the TLS credentials object
* @secalias: if one exists, the alias of the security object for passwordid * @secalias: if one exists, the alias of the security object for passwordid
* @qemuCaps: capabilities
* @propsret: json properties to return * @propsret: json properties to return
* *
* Create a backend string for the tls-creds-x509 object. * Create a backend string for the tls-creds-x509 object.
@ -767,7 +766,6 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
bool verifypeer, bool verifypeer,
const char *alias, const char *alias,
const char *secalias, const char *secalias,
virQEMUCaps *qemuCaps G_GNUC_UNUSED,
virJSONValue **propsret) virJSONValue **propsret)
{ {
if (qemuMonitorCreateObjectProps(propsret, "tls-creds-x509", alias, if (qemuMonitorCreateObjectProps(propsret, "tls-creds-x509", alias,
@ -809,7 +807,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,
g_autoptr(virJSONValue) props = NULL; g_autoptr(virJSONValue) props = NULL;
if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias,
certEncSecretAlias, qemuCaps, &props) < 0) certEncSecretAlias, &props) < 0)
return -1; return -1;
if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0)
@ -1936,8 +1934,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd,
if (virStorageSourceIsEmpty(disk->src)) if (virStorageSourceIsEmpty(disk->src))
return 0; return 0;
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src)))
qemuCaps)))
return -1; return -1;
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON && if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON &&
@ -5062,7 +5059,7 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev,
} }
if (src && if (src &&
qemuBuildStorageSourceAttachPrepareCommon(src, ret, qemuCaps) < 0) qemuBuildStorageSourceAttachPrepareCommon(src, ret) < 0)
return NULL; return NULL;
return g_steal_pointer(&ret); return g_steal_pointer(&ret);
@ -9962,8 +9959,7 @@ qemuBuildPflashBlockdevOne(virCommand *cmd,
g_autoptr(qemuBlockStorageSourceChainData) data = NULL; g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
size_t i; size_t i;
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(src, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(src)))
qemuCaps)))
return -1; return -1;
for (i = data->nsrcdata; i > 0; i--) { for (i = data->nsrcdata; i > 0; i--) {
@ -10840,15 +10836,13 @@ qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk)
* qemuBuildStorageSourceAttachPrepareCommon: * qemuBuildStorageSourceAttachPrepareCommon:
* @src: storage source * @src: storage source
* @data: already initialized data for disk source addition * @data: already initialized data for disk source addition
* @qemuCaps: qemu capabilities object
* *
* Prepare data for configuration associated with the disk source such as * Prepare data for configuration associated with the disk source such as
* secrets/TLS/pr objects etc ... * secrets/TLS/pr objects etc ...
*/ */
int int
qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src, qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
qemuBlockStorageSourceAttachData *data, qemuBlockStorageSourceAttachData *data)
virQEMUCaps *qemuCaps)
{ {
qemuDomainStorageSourcePrivate *srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); qemuDomainStorageSourcePrivate *srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
const char *tlsKeySecretAlias = NULL; const char *tlsKeySecretAlias = NULL;
@ -10881,7 +10875,7 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
if (src->haveTLS == VIR_TRISTATE_BOOL_YES && if (src->haveTLS == VIR_TRISTATE_BOOL_YES &&
qemuBuildTLSx509BackendProps(src->tlsCertdir, false, true, src->tlsAlias, qemuBuildTLSx509BackendProps(src->tlsCertdir, false, true, src->tlsAlias,
tlsKeySecretAlias, qemuCaps, &data->tlsProps) < 0) tlsKeySecretAlias, &data->tlsProps) < 0)
return -1; return -1;
return 0; return 0;
@ -10907,7 +10901,7 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDef *disk,
if (!(elem = qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps))) if (!(elem = qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps)))
return NULL; return NULL;
if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, elem, qemuCaps) < 0) if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, elem) < 0)
return NULL; return NULL;
VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem); VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem);
@ -10943,15 +10937,14 @@ qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk)
static int static int
qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainData *data, qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainData *data,
virStorageSource *src, virStorageSource *src,
virStorageSource *backingStore, virStorageSource *backingStore)
virQEMUCaps *qemuCaps)
{ {
g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL; g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL;
if (!(elem = qemuBlockStorageSourceAttachPrepareBlockdev(src, backingStore, true))) if (!(elem = qemuBlockStorageSourceAttachPrepareBlockdev(src, backingStore, true)))
return -1; return -1;
if (qemuBuildStorageSourceAttachPrepareCommon(src, elem, qemuCaps) < 0) if (qemuBuildStorageSourceAttachPrepareCommon(src, elem) < 0)
return -1; return -1;
VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem); VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem);
@ -10963,14 +10956,12 @@ qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainD
/** /**
* qemuBuildStorageSourceChainAttachPrepareBlockdev: * qemuBuildStorageSourceChainAttachPrepareBlockdev:
* @top: storage source chain * @top: storage source chain
* @qemuCaps: qemu capabilities object
* *
* Prepares qemuBlockStorageSourceChainData *for attaching the chain of images * Prepares qemuBlockStorageSourceChainData *for attaching the chain of images
* starting at @top via -blockdev. * starting at @top via -blockdev.
*/ */
qemuBlockStorageSourceChainData * qemuBlockStorageSourceChainData *
qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top, qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top)
virQEMUCaps *qemuCaps)
{ {
g_autoptr(qemuBlockStorageSourceChainData) data = NULL; g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
virStorageSource *n; virStorageSource *n;
@ -10979,8 +10970,7 @@ qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top,
for (n = top; virStorageSourceIsBacking(n); n = n->backingStore) { for (n = top; virStorageSourceIsBacking(n); n = n->backingStore) {
if (qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, n, if (qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, n,
n->backingStore, n->backingStore) < 0)
qemuCaps) < 0)
return NULL; return NULL;
} }
@ -10992,22 +10982,19 @@ qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top,
* qemuBuildStorageSourceChainAttachPrepareBlockdevTop: * qemuBuildStorageSourceChainAttachPrepareBlockdevTop:
* @top: storage source chain * @top: storage source chain
* @backingStore: a storage source to use as backing of @top * @backingStore: a storage source to use as backing of @top
* @qemuCaps: qemu capabilities object
* *
* Prepares qemuBlockStorageSourceChainData *for attaching of @top image only * Prepares qemuBlockStorageSourceChainData *for attaching of @top image only
* via -blockdev. * via -blockdev.
*/ */
qemuBlockStorageSourceChainData * qemuBlockStorageSourceChainData *
qemuBuildStorageSourceChainAttachPrepareBlockdevTop(virStorageSource *top, qemuBuildStorageSourceChainAttachPrepareBlockdevTop(virStorageSource *top,
virStorageSource *backingStore, virStorageSource *backingStore)
virQEMUCaps *qemuCaps)
{ {
g_autoptr(qemuBlockStorageSourceChainData) data = NULL; g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
data = g_new0(qemuBlockStorageSourceChainData, 1); data = g_new0(qemuBlockStorageSourceChainData, 1);
if (qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, top, backingStore, if (qemuBuildStorageSourceChainAttachPrepareBlockdevOne(data, top, backingStore) < 0)
qemuCaps) < 0)
return NULL; return NULL;
return g_steal_pointer(&data); return g_steal_pointer(&data);

10
src/qemu/qemu_command.h
View File

@ -77,7 +77,6 @@ int qemuBuildTLSx509BackendProps(const char *tlspath,
bool verifypeer, bool verifypeer,
const char *alias, const char *alias,
const char *secalias, const char *secalias,
virQEMUCaps *qemuCaps,
virJSONValue **propsret); virJSONValue **propsret);
/* Open a UNIX socket for chardev FD passing */ /* Open a UNIX socket for chardev FD passing */
@ -121,8 +120,7 @@ qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk);
int int
qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src, qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
qemuBlockStorageSourceAttachData *data, qemuBlockStorageSourceAttachData *data);
virQEMUCaps *qemuCaps);
qemuBlockStorageSourceChainData * qemuBlockStorageSourceChainData *
@ -135,13 +133,11 @@ qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk);
qemuBlockStorageSourceChainData * qemuBlockStorageSourceChainData *
qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top, qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSource *top);
virQEMUCaps *qemuCaps);
qemuBlockStorageSourceChainData * qemuBlockStorageSourceChainData *
qemuBuildStorageSourceChainAttachPrepareBlockdevTop(virStorageSource *top, qemuBuildStorageSourceChainAttachPrepareBlockdevTop(virStorageSource *top,
virStorageSource *backingStore, virStorageSource *backingStore);
virQEMUCaps *qemuCaps);
char char
*qemuBuildDiskDeviceStr(const virDomainDef *def, *qemuBuildDiskDeviceStr(const virDomainDef *def,

15
src/qemu/qemu_driver.c
View File

@ -14076,8 +14076,7 @@ qemuDomainBlockPivot(virQEMUDriver *driver,
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) &&
virStorageSourceHasBacking(disk->mirror)) { virStorageSourceHasBacking(disk->mirror)) {
if (!(chainattachdata = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->mirror->backingStore, if (!(chainattachdata = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->mirror->backingStore)))
priv->qemuCaps)))
return -1; return -1;
reopenactions = virJSONValueNewArray(); reopenactions = virJSONValueNewArray();
@ -14898,12 +14897,10 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
g_autoptr(virStorageSource) terminator = virStorageSourceNew(); g_autoptr(virStorageSource) terminator = virStorageSourceNew();
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
terminator, terminator)))
priv->qemuCaps)))
goto endjob; goto endjob;
} else { } else {
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror)))
priv->qemuCaps)))
goto endjob; goto endjob;
} }
} else { } else {
@ -14917,8 +14914,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
if (mirror_shallow) { if (mirror_shallow) {
/* if external backing store is populated we'll need to open it */ /* if external backing store is populated we'll need to open it */
if (virStorageSourceHasBacking(mirror)) { if (virStorageSourceHasBacking(mirror)) {
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror->backingStore, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror->backingStore)))
priv->qemuCaps)))
goto endjob; goto endjob;
mirrorBacking = mirror->backingStore; mirrorBacking = mirror->backingStore;
@ -14932,8 +14928,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
} }
if (!(crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror, if (!(crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
mirrorBacking, mirrorBacking)))
priv->qemuCaps)))
goto endjob; goto endjob;
} }

13
src/qemu/qemu_hotplug.c
View File

@ -526,8 +526,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver,
return -1; return -1;
if (!virStorageSourceIsEmpty(newsrc)) { if (!virStorageSourceIsEmpty(newsrc)) {
if (!(newbackend = qemuBuildStorageSourceChainAttachPrepareBlockdev(newsrc, if (!(newbackend = qemuBuildStorageSourceChainAttachPrepareBlockdev(newsrc)))
priv->qemuCaps)))
return -1; return -1;
if (qemuDomainDiskGetBackendAlias(disk, priv->qemuCaps, &nodename) < 0) if (qemuDomainDiskGetBackendAlias(disk, priv->qemuCaps, &nodename) < 0)
@ -734,8 +733,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk))) if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
return -1; return -1;
} else if (blockdev) { } else if (blockdev) {
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src, if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src)))
priv->qemuCaps)))
return -1; return -1;
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) { if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) {
@ -1831,8 +1829,7 @@ qemuDomainAddTLSObjects(virQEMUDriver *driver,
int int
qemuDomainGetTLSObjects(virQEMUCaps *qemuCaps, qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
qemuDomainSecretInfo *secinfo,
const char *tlsCertdir, const char *tlsCertdir,
bool tlsListen, bool tlsListen,
bool tlsVerify, bool tlsVerify,
@ -1850,7 +1847,7 @@ qemuDomainGetTLSObjects(virQEMUCaps *qemuCaps,
} }
if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify,
alias, secAlias, qemuCaps, tlsProps) < 0) alias, secAlias, tlsProps) < 0)
return -1; return -1;
return 0; return 0;
@ -1895,7 +1892,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriver *driver,
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
goto cleanup; goto cleanup;
if (qemuDomainGetTLSObjects(priv->qemuCaps, secinfo, if (qemuDomainGetTLSObjects(secinfo,
cfg->chardevTLSx509certdir, cfg->chardevTLSx509certdir,
dev->data.tcp.listen, dev->data.tcp.listen,
cfg->chardevTLSx509verify, cfg->chardevTLSx509verify,

3
src/qemu/qemu_hotplug.h
View File

@ -43,8 +43,7 @@ int qemuDomainAddTLSObjects(virQEMUDriver *driver,
virJSONValue **secProps, virJSONValue **secProps,
virJSONValue **tlsProps); virJSONValue **tlsProps);
int qemuDomainGetTLSObjects(virQEMUCaps *qemuCaps, int qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
qemuDomainSecretInfo *secinfo,
const char *tlsCertdir, const char *tlsCertdir,
bool tlsListen, bool tlsListen,
bool tlsVerify, bool tlsVerify,

2
src/qemu/qemu_migration_params.c
View File

@ -961,7 +961,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE))) if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
return -1; return -1;
if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo, if (qemuDomainGetTLSObjects(priv->migSecinfo,
cfg->migrateTLSx509certdir, tlsListen, cfg->migrateTLSx509certdir, tlsListen,
cfg->migrateTLSx509verify, cfg->migrateTLSx509verify,
*tlsAlias, &tlsProps, &secProps) < 0) *tlsAlias, &tlsProps, &secProps) < 0)

3
src/qemu/qemu_snapshot.c
View File

@ -1023,8 +1023,7 @@ qemuSnapshotDiskPrepareOneBlockdev(virQEMUDriver *driver,
return -1; return -1;
if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src,
terminator, terminator)))
priv->qemuCaps)))
return -1; return -1;
if (reuse) { if (reuse) {