From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com, dgilbert@redhat.com
Subject: [Qemu-devel] [PULL 13/15] migration: Fix seg with missing port
Date: Fri, 14 Oct 2016 17:28:21 +0200 [thread overview]
Message-ID: <1476458903-7888-14-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1476458903-7888-1-git-send-email-quintela@redhat.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The command :
migrate tcp:localhost:
currently segs; fix it so it now says:
error parsing address 'localhost:'
and the same for -incoming.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/socket.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index 00de1fe..a21c0c5 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -112,8 +112,12 @@ void tcp_start_outgoing_migration(MigrationState *s,
const char *host_port,
Error **errp)
{
- SocketAddress *saddr = tcp_build_address(host_port, errp);
- socket_start_outgoing_migration(s, saddr, errp);
+ Error *err = NULL;
+ SocketAddress *saddr = tcp_build_address(host_port, &err);
+ if (!err) {
+ socket_start_outgoing_migration(s, saddr, &err);
+ }
+ error_propagate(errp, err);
}
void unix_start_outgoing_migration(MigrationState *s,
@@ -174,8 +178,12 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
void tcp_start_incoming_migration(const char *host_port, Error **errp)
{
- SocketAddress *saddr = tcp_build_address(host_port, errp);
- socket_start_incoming_migration(saddr, errp);
+ Error *err = NULL;
+ SocketAddress *saddr = tcp_build_address(host_port, &err);
+ if (!err) {
+ socket_start_incoming_migration(saddr, &err);
+ }
+ error_propagate(errp, err);
}
void unix_start_incoming_migration(const char *path, Error **errp)
--
2.7.4
next prev parent reply other threads:[~2016-10-14 15:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 15:28 [Qemu-devel] [PULL 00/15] Migration v2 Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 01/15] migration: report an error giving the failed field Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 02/15] migration: Report values for comparisons Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 03/15] migration/rdma: Pass qemu_file errors across link Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 04/15] migration: Make failed migration load set file error Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 05/15] migration/rdma: Don't flag an error when we've been told about one Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 06/15] migrate: Fix cpu-throttle-increment regression in HMP Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 07/15] migrate: Share common MigrationParameters struct Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 08/15] migrate: Use boxed qapi for migrate-set-parameters Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 09/15] migrate: Fix bounds check for migration parameters in migration.c Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 10/15] Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8] Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 11/15] RAMBlocks: Store page size Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 12/15] migration/postcopy: Explicitly disallow huge pages Juan Quintela
2016-10-14 15:28 ` Juan Quintela [this message]
2016-10-14 15:28 ` [Qemu-devel] [PULL 14/15] migrate: move max-bandwidth and downtime-limit to migrate_set_parameter Juan Quintela
2016-10-14 15:28 ` [Qemu-devel] [PULL 15/15] docs/xbzrle: correction Juan Quintela
2016-10-17 10:56 ` [Qemu-devel] [PULL 00/15] Migration v2 Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2016-10-05 13:44 [Qemu-devel] [PULL 00/15] Migration Juan Quintela
2016-10-05 13:45 ` [Qemu-devel] [PULL 13/15] migration: Fix seg with missing port Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476458903-7888-14-git-send-email-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=amit.shah@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).