External/libvirt
1
0
Fork 0
Code

qemuProcessPrepareHostBackendChardev: Drop unneeded arguments

Browse Source 
Caller passes 'driver->securityManager', and 'priv->qemuCaps' as
arguments along with 'vm', but both aforementioned objects are
accessible directly from 'vm'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-03 11:00:29 +01:00
parent 9aab7acfe0
commit 2a80ae1b30
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/qemu/qemu_process.c
View File

@ -6777,9 +6777,8 @@ qemuProcessPrepareHostBackendChardevFileHelper(const char *path,
struct qemuProcessPrepareHostBackendChardevData { struct qemuProcessPrepareHostBackendChardevData {
virQEMUCaps *qemuCaps; qemuDomainObjPrivate *priv;
virLogManager *logManager; virLogManager *logManager;
virSecurityManager *secManager;
virQEMUDriverConfig *cfg; virQEMUDriverConfig *cfg;
virDomainDef *def; virDomainDef *def;
}; };
@ -6829,7 +6828,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
chardev->data.file.append, chardev->data.file.append,
&charpriv->fd, &charpriv->fd,
data->logManager, data->logManager,
data->secManager, data->priv->driver->securityManager,
data->cfg, data->cfg,
data->def) < 0) data->def) < 0)
return -1; return -1;
@ -6838,14 +6837,14 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
if (chardev->data.nix.listen && if (chardev->data.nix.listen &&
virQEMUCapsGet(data->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) { virQEMUCapsGet(data->priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) {
if (qemuSecuritySetSocketLabel(data->secManager, data->def) < 0) if (qemuSecuritySetSocketLabel(data->priv->driver->securityManager, data->def) < 0)
return -1; return -1;
charpriv->fd = qemuOpenChrChardevUNIXSocket(chardev); charpriv->fd = qemuOpenChrChardevUNIXSocket(chardev);
if (qemuSecurityClearSocketLabel(data->secManager, data->def) < 0) { if (qemuSecurityClearSocketLabel(data->priv->driver->securityManager, data->def) < 0) {
VIR_FORCE_CLOSE(charpriv->fd); VIR_FORCE_CLOSE(charpriv->fd);
return -1; return -1;
} }
@ -6869,7 +6868,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
chardev->logappend, chardev->logappend,
&charpriv->logfd, &charpriv->logfd,
data->logManager, data->logManager,
data->secManager, data->priv->driver->securityManager,
data->cfg, data->cfg,
data->def) < 0) data->def) < 0)
return -1; return -1;
@ -6883,16 +6882,13 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
* serial/parallel/channel chardevs, vhost-user disks, vhost-user network * serial/parallel/channel chardevs, vhost-user disks, vhost-user network
* interfaces, smartcards, shared memory, and redirdevs */ * interfaces, smartcards, shared memory, and redirdevs */
static int static int
qemuProcessPrepareHostBackendChardev(virDomainObj *vm, qemuProcessPrepareHostBackendChardev(virDomainObj *vm)
virQEMUCaps *qemuCaps,
virSecurityManager *secManager)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
struct qemuProcessPrepareHostBackendChardevData data = { struct qemuProcessPrepareHostBackendChardevData data = {
.qemuCaps = qemuCaps, .priv = priv,
.logManager = NULL, .logManager = NULL,
.secManager = secManager,
.cfg = cfg, .cfg = cfg,
.def = vm->def, .def = vm->def,
}; };
@ -6970,9 +6966,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
return -1; return -1;
VIR_DEBUG("Preparing chr device backends"); VIR_DEBUG("Preparing chr device backends");
if (qemuProcessPrepareHostBackendChardev(vm, if (qemuProcessPrepareHostBackendChardev(vm) < 0)
priv->qemuCaps,
driver->securityManager) < 0)
return -1; return -1;
if (qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, true) < 0) if (qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, true) < 0)