|
 |
127bba |
From 2479f664481c9c512b3fb2da21aeaac37f53d584 Mon Sep 17 00:00:00 2001
|
|
|
127bba |
Message-Id: <2479f664481c9c512b3fb2da21aeaac37f53d584@dist-git>
|
|
|
127bba |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
Date: Fri, 4 Nov 2016 10:29:42 +0100
|
|
|
127bba |
Subject: [PATCH] qemu: Rename qemuBuildShmemBackendStr to
|
|
|
127bba |
qemuBuildShmemBackendChrStr
|
|
|
127bba |
|
|
|
127bba |
There will be more backends in the future so let's not complicate it.
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
(cherry picked from commit a0c99e1a0aadbc4ed7e1670d63e29e49b8a7a67a)
|
|
|
127bba |
|
|
|
127bba |
https://bugzilla.redhat.com/show_bug.cgi?id=1392031
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
---
|
|
|
127bba |
src/qemu/qemu_command.c | 16 ++++++++--------
|
|
|
127bba |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
127bba |
|
|
|
127bba |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
127bba |
index adb743b..e668a58 100644
|
|
|
127bba |
--- a/src/qemu/qemu_command.c
|
|
|
127bba |
+++ b/src/qemu/qemu_command.c
|
|
|
127bba |
@@ -8504,12 +8504,12 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
|
|
|
127bba |
}
|
|
|
127bba |
|
|
|
127bba |
static char *
|
|
|
127bba |
-qemuBuildShmemBackendStr(virLogManagerPtr logManager,
|
|
|
127bba |
- virCommandPtr cmd,
|
|
|
127bba |
- virQEMUDriverConfigPtr cfg,
|
|
|
127bba |
- virDomainDefPtr def,
|
|
|
127bba |
- virDomainShmemDefPtr shmem,
|
|
|
127bba |
- virQEMUCapsPtr qemuCaps)
|
|
|
127bba |
+qemuBuildShmemBackendChrStr(virLogManagerPtr logManager,
|
|
|
127bba |
+ virCommandPtr cmd,
|
|
|
127bba |
+ virQEMUDriverConfigPtr cfg,
|
|
|
127bba |
+ virDomainDefPtr def,
|
|
|
127bba |
+ virDomainShmemDefPtr shmem,
|
|
|
127bba |
+ virQEMUCapsPtr qemuCaps)
|
|
|
127bba |
{
|
|
|
127bba |
char *devstr = NULL;
|
|
|
127bba |
|
|
|
127bba |
@@ -8565,8 +8565,8 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
|
|
|
127bba |
VIR_FREE(devstr);
|
|
|
127bba |
|
|
|
127bba |
if (shmem->server.enabled) {
|
|
|
127bba |
- if (!(devstr = qemuBuildShmemBackendStr(logManager, cmd, cfg, def,
|
|
|
127bba |
- shmem, qemuCaps)))
|
|
|
127bba |
+ if (!(devstr = qemuBuildShmemBackendChrStr(logManager, cmd, cfg, def,
|
|
|
127bba |
+ shmem, qemuCaps)))
|
|
|
127bba |
return -1;
|
|
|
127bba |
|
|
|
127bba |
virCommandAddArgList(cmd, "-chardev", devstr, NULL);
|
|
|
127bba |
--
|
|
|
127bba |
2.10.2
|
|
|
127bba |
|