External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNetClientStreamNew: Track origin stream

Browse Source 
Add a virStreamPtr pointer to the _virNetClientStream
in order to reverse track the parent stream.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-04-12 11:38:12 +02:00
parent 84b5079232
commit 8b6ffe4077
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/remote/remote_driver.c
View File

@ -6170,7 +6170,8 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn,
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (!(netst = virNetClientStreamNew(priv->remoteProgram, if (!(netst = virNetClientStreamNew(st,
priv->remoteProgram,
REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3,
priv->counter))) priv->counter)))
goto done; goto done;
@ -7094,7 +7095,8 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn,
goto cleanup; goto cleanup;
} }
if (!(netst = virNetClientStreamNew(priv->remoteProgram, if (!(netst = virNetClientStreamNew(st,
priv->remoteProgram,
REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PARAMS, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PARAMS,
priv->counter))) priv->counter)))
goto cleanup; goto cleanup;

2
src/rpc/gendispatch.pl
View File

@ -1738,7 +1738,7 @@ elsif ($mode eq "client") {
if ($call->{streamflag} ne "none") { if ($call->{streamflag} ne "none") {
print "\n"; print "\n";
print " if (!(netst = virNetClientStreamNew(priv->remoteProgram, $call->{constname}, priv->counter)))\n"; print " if (!(netst = virNetClientStreamNew(st, priv->remoteProgram, $call->{constname}, priv->counter)))\n";
print " goto done;\n"; print " goto done;\n";
print "\n"; print "\n";
print " if (virNetClientAddStream(priv->client, netst) < 0) {\n"; print " if (virNetClientAddStream(priv->client, netst) < 0) {\n";

7
src/rpc/virnetclientstream.c
View File

@ -36,6 +36,8 @@ VIR_LOG_INIT("rpc.netclientstream");
struct _virNetClientStream { struct _virNetClientStream {
virObjectLockable parent; virObjectLockable parent;
virStreamPtr stream; /* Reverse pointer to parent stream */
virNetClientProgramPtr prog; virNetClientProgramPtr prog;
int proc; int proc;
unsigned serial; unsigned serial;
@ -133,7 +135,8 @@ virNetClientStreamEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque)
} }
virNetClientStreamPtr virNetClientStreamNew(virNetClientProgramPtr prog, virNetClientStreamPtr virNetClientStreamNew(virStreamPtr stream,
virNetClientProgramPtr prog,
int proc, int proc,
unsigned serial) unsigned serial)
{ {
@ -145,6 +148,7 @@ virNetClientStreamPtr virNetClientStreamNew(virNetClientProgramPtr prog,
if (!(st = virObjectLockableNew(virNetClientStreamClass))) if (!(st = virObjectLockableNew(virNetClientStreamClass)))
return NULL; return NULL;
st->stream = virObjectRef(stream);
st->prog = virObjectRef(prog); st->prog = virObjectRef(prog);
st->proc = proc; st->proc = proc;
st->serial = serial; st->serial = serial;
@ -163,6 +167,7 @@ void virNetClientStreamDispose(void *obj)
virNetMessageFree(msg); virNetMessageFree(msg);
} }
virObjectUnref(st->prog); virObjectUnref(st->prog);
virObjectUnref(st->stream);
} }
bool virNetClientStreamMatches(virNetClientStreamPtr st, bool virNetClientStreamMatches(virNetClientStreamPtr st,

3
src/rpc/virnetclientstream.h
View File

@ -32,7 +32,8 @@ typedef virNetClientStream *virNetClientStreamPtr;
typedef void (*virNetClientStreamEventCallback)(virNetClientStreamPtr stream, typedef void (*virNetClientStreamEventCallback)(virNetClientStreamPtr stream,
int events, void *opaque); int events, void *opaque);
virNetClientStreamPtr virNetClientStreamNew(virNetClientProgramPtr prog, virNetClientStreamPtr virNetClientStreamNew(virStreamPtr stream,
virNetClientProgramPtr prog,
int proc, int proc,
unsigned serial); unsigned serial);