[libvirt] [PATCH 4/8] qemu: export vsock-related functions

[Ján Tomko]

Export qemuAssignDeviceVsockAlias, qemuBuildVsockDevStr
and qemuProcessOpenVhostVsock for reuse in hotplug.

https://bugzilla.redhat.com/show_bug.cgi?id=1291851

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_alias.c   | 2 +-
 src/qemu/qemu_alias.h   | 2 ++
 src/qemu/qemu_command.c | 2 +-
 src/qemu/qemu_command.h | 8 ++++++++
 src/qemu/qemu_process.c | 2 +-
 src/qemu/qemu_process.h | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 89dec91ed1..72cba7f365 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -533,7 +533,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def,
 }
 
 
-static int
+int
 qemuAssignDeviceVsockAlias(virDomainVsockDefPtr vsock)
 {
     if (vsock->info.alias)
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 51f64624d7..4ca0aaf9a6 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -70,6 +70,8 @@ int qemuAssignDeviceInputAlias(virDomainDefPtr def,
                                virDomainInputDefPtr input,
                                int idx);
 
+int qemuAssignDeviceVsockAlias(virDomainVsockDefPtr vsock);
+
 int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
 
 int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info,
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 89cd931de6..26aeca05bf 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9912,7 +9912,7 @@ qemuBuildSeccompSandboxCommandLine(virCommandPtr cmd,
 }
 
 
-static char *
+char *
 qemuBuildVsockDevStr(virDomainDefPtr def,
                      virDomainVsockDefPtr vsock,
                      virQEMUCapsPtr qemuCaps,
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index bbbf152660..36bf822414 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -206,4 +206,12 @@ int qemuBuildInputDevStr(char **devstr,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_NONNULL(4);
 
+char *
+qemuBuildVsockDevStr(virDomainDefPtr def,
+                     virDomainVsockDefPtr vsock,
+                     virQEMUCapsPtr qemuCaps,
+                     const char *fdprefix)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
+    ATTRIBUTE_NONNULL(4);
+
 #endif /* __QEMU_COMMAND_H__*/
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 30cc5904e0..68960cc1be 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5948,7 +5948,7 @@ qemuProcessPrepareHostStorage(virQEMUDriverPtr driver,
 }
 
 
-static int
+int
 qemuProcessOpenVhostVsock(virDomainVsockDefPtr vsock)
 {
     qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData;
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 5098eacfe8..531c2a0cc7 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -113,6 +113,8 @@ int qemuProcessPrepareDomain(virQEMUDriverPtr driver,
                              virDomainObjPtr vm,
                              unsigned int flags);
 
+int qemuProcessOpenVhostVsock(virDomainVsockDefPtr vsock);
+
 int qemuProcessPrepareHost(virQEMUDriverPtr driver,
                            virDomainObjPtr vm,
                            unsigned int flags);
-- 
2.16.1