3:18 a.m.
Here's pipeline:
https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/315940894
I have not merged these yet. I'll give others a chance to fix my grammar
:-)
Michal Prívozník (3):
doRemoteOpen: Drop @daemonPath
virnetsocket: Mark @spawnDaemonPath of virNetSocketNewConnectUNIX()
unused
remoteGetUNIXSocket: Complete variable rename for WIN32
src/remote/remote_driver.c | 3 ---
src/remote/remote_sockets.c | 2 +-
src/rpc/virnetsocket.c | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
--
2.31.1
3:18 a.m.
New subject: [PATCH 1/3] doRemoteOpen: Drop @daemonPath
The @daemonPath variable in doRemoteOpen() is no longer used
after faf8354674. Remove it.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/remote/remote_driver.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index da672b0d00..c03c68ec30 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -729,9 +729,6 @@ doRemoteOpen(virConnectPtr conn,
virConf *conf,
unsigned int flags)
{
-#ifndef WIN32
- g_autofree char *daemonPath = NULL;
-#endif
g_autofree char *tls_priority = NULL;
g_autofree char *name = NULL;
g_autofree char *command = NULL;
--
2.31.1
3:18 a.m.
New subject: [PATCH 2/3] virnetsocket: Mark @spawnDaemonPath of virNetSocketNewConnectUNIX() unused
The virNetSocketNewConnectUNIX() function was changed in
48f66cfe3e. And its WIN32 version (which just reports an error)
was updated too, but this new argument @spawnDaemonPath was not
marked as unused.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/rpc/virnetsocket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index c3fae8b626..212089520d 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -774,7 +774,7 @@ int virNetSocketNewConnectUNIX(const char *path,
}
#else
int virNetSocketNewConnectUNIX(const char *path G_GNUC_UNUSED,
- const char *spawnDaemonPath,
+ const char *spawnDaemonPath G_GNUC_UNUSED,
virNetSocket **retsock G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
--
2.31.1
3:18 a.m.
New subject: [PATCH 3/3] remoteGetUNIXSocket: Complete variable rename for WIN32
In fcdcf8f70cf the remoteGetUNIXSocket() function was changed and
one new variable was introduced (among other things): @env_name.
However, for WIN32 case the variable changed name to @env_path
which builds mingw builds.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/remote/remote_sockets.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c
index ed4e4a329c..0f85b999fd 100644
--- a/src/remote/remote_sockets.c
+++ b/src/remote/remote_sockets.c
@@ -163,7 +163,7 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
#ifndef WIN32
const char *env_name = remoteGetDaemonPathEnv();
#else
- const char *env_path = NULL;
+ const char *env_name = NULL;
#endif
VIR_DEBUG("Choosing remote socket for transport=%s mode=%s driver=%s
flags=0x%x",
--
2.31.1
3:33 a.m.
On Mon, Jun 07, 2021 at 10:18:39 +0200, Michal Privoznik wrote:
Here's pipeline:
https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/315940894
I have not merged these yet. I'll give others a chance to fix my grammar
:-)
Michal Prívozník (3):
doRemoteOpen: Drop @daemonPath
virnetsocket: Mark @spawnDaemonPath of virNetSocketNewConnectUNIX()
unused
remoteGetUNIXSocket: Complete variable rename for WIN32
Please push them, I was about to push daniel's fix but it looks like you
are fixing another thing too.
3:46 a.m.
On 6/7/21 10:33 AM, Peter Krempa wrote:
On Mon, Jun 07, 2021 at 10:18:39 +0200, Michal Privoznik wrote:
> Here's pipeline:
>
> https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/315940894
>
> I have not merged these yet. I'll give others a chance to fix my grammar
> :-)
>
> Michal Prívozník (3):
> doRemoteOpen: Drop @daemonPath
> virnetsocket: Mark @spawnDaemonPath of virNetSocketNewConnectUNIX()
> unused
> remoteGetUNIXSocket: Complete variable rename for WIN32
Please push them, I was about to push daniel's fix but it looks like you
are fixing another thing too.
Alright, pushed under build breaker rule.
Michal
1264
days inactive
1264
days old
5 comments
3 participants
participants (3)
-
Michal Privoznik -
Michal Prívozník
-
Peter Krempa