56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
|
From ab52cf0ea29a263db426fec813946daab2ad9b27 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Tue, 30 Jun 2020 22:02:19 +0200
|
||
|
|
Subject: [PATCH 006/108] qemu_security: Complete renaming of
|
||
|
|
virSecurityManagerSetAllLabel() argument
|
||
|
|
|
||
|
|
Just like in the previous commit, the stdin_path argument of
|
||
|
|
virSecurityManagerSetAllLabel() is renamed to incomingPath.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||
|
|
(cherry picked from commit 77ef11845696ee971d4a285eb344136113b1e6f2)
|
||
|
|
---
|
||
|
|
src/qemu/qemu_security.c | 4 ++--
|
||
|
|
src/qemu/qemu_security.h | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
|
||
|
|
index 484fc34552..e7f38cb69b 100644
|
||
|
|
--- a/src/qemu/qemu_security.c
|
||
|
|
+++ b/src/qemu/qemu_security.c
|
||
|
|
@@ -32,7 +32,7 @@ VIR_LOG_INIT("qemu.qemu_process");
|
||
|
|
int
|
||
|
|
qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
|
||
|
|
virDomainObjPtr vm,
|
||
|
|
- const char *stdin_path,
|
||
|
|
+ const char *incomingPath,
|
||
|
|
bool migrated)
|
||
|
|
{
|
||
|
|
int ret = -1;
|
||
|
|
@@ -47,7 +47,7 @@ qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
|
||
|
|
|
||
|
|
if (virSecurityManagerSetAllLabel(driver->securityManager,
|
||
|
|
vm->def,
|
||
|
|
- stdin_path,
|
||
|
|
+ incomingPath,
|
||
|
|
priv->chardevStdioLogd,
|
||
|
|
migrated) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
|
||
|
|
index c8516005ac..89dca61c3a 100644
|
||
|
|
--- a/src/qemu/qemu_security.h
|
||
|
|
+++ b/src/qemu/qemu_security.h
|
||
|
|
@@ -26,7 +26,7 @@
|
||
|
|
|
||
|
|
int qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
|
||
|
|
virDomainObjPtr vm,
|
||
|
|
- const char *stdin_path,
|
||
|
|
+ const char *incomingPath,
|
||
|
|
bool migrated);
|
||
|
|
|
||
|
|
void qemuSecurityRestoreAllLabel(virQEMUDriverPtr driver,
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|