Message ID | 20100724100303.GA23454@redhat.com |
---|---|
State | New |
Headers | show |
On Sat, Jul 24, 2010 at 01:03:07PM +0300, Shahar Havivi wrote: > > Signed-off-by: Shahar Havivi <shaharh@redhat.com> > --- > migration-tcp.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Thanks, applied. > diff --git a/migration-tcp.c b/migration-tcp.c > index 78b56dc..b55f419 100644 > --- a/migration-tcp.c > +++ b/migration-tcp.c > @@ -151,7 +151,7 @@ static void tcp_accept_incoming_migration(void *opaque) > > if (c == -1) { > fprintf(stderr, "could not accept migration connection\n"); > - return; > + goto out2; > } > > f = qemu_fopen_socket(c); > @@ -163,9 +163,10 @@ static void tcp_accept_incoming_migration(void *opaque) > process_incoming_migration(f); > qemu_fclose(f); > out: > + close(c); > +out2: > qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); > close(s); > - close(c); > } > > int tcp_start_incoming_migration(const char *host_port) > -- > 1.7.1.1 > > >
diff --git a/migration-tcp.c b/migration-tcp.c index 78b56dc..b55f419 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -151,7 +151,7 @@ static void tcp_accept_incoming_migration(void *opaque) if (c == -1) { fprintf(stderr, "could not accept migration connection\n"); - return; + goto out2; } f = qemu_fopen_socket(c); @@ -163,9 +163,10 @@ static void tcp_accept_incoming_migration(void *opaque) process_incoming_migration(f); qemu_fclose(f); out: + close(c); +out2: qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); close(s); - close(c); } int tcp_start_incoming_migration(const char *host_port)
Signed-off-by: Shahar Havivi <shaharh@redhat.com> --- migration-tcp.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)