From patchwork Wed Apr 27 10:05:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8954491 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 68C819F441 for ; Wed, 27 Apr 2016 10:10:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A93DF2021F for ; Wed, 27 Apr 2016 10:10:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9D4F2015A for ; Wed, 27 Apr 2016 10:10:15 +0000 (UTC) Received: from localhost ([::1]:42260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avMQA-0005Dv-QR for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Apr 2016 06:10:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avMLp-0005UD-NH for qemu-devel@nongnu.org; Wed, 27 Apr 2016 06:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avMLo-0004Vz-9e for qemu-devel@nongnu.org; Wed, 27 Apr 2016 06:05:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avMLo-0004Vv-1r for qemu-devel@nongnu.org; Wed, 27 Apr 2016 06:05:44 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBD11627DA for ; Wed, 27 Apr 2016 10:05:43 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-18.ams2.redhat.com [10.36.6.18]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3RA5MRM030816; Wed, 27 Apr 2016 06:05:42 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Wed, 27 Apr 2016 11:05:03 +0100 Message-Id: <1461751518-12128-14-git-send-email-berrange@redhat.com> In-Reply-To: <1461751518-12128-1-git-send-email-berrange@redhat.com> References: <1461751518-12128-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 27 Apr 2016 10:05:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 for-2.7 13/28] migration: rename unix.c to socket.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amit Shah , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The unix.c file will be nearly the same as the tcp.c file, only differing in the initial SocketAddress creation code. Rename unix.c to socket.c and refactor it a little to prepare for merging the TCP code. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange --- migration/Makefile.objs | 2 +- migration/{unix.c => socket.c} | 53 +++++++++++++++++++++++++----------------- trace-events | 8 +++---- 3 files changed, 37 insertions(+), 26 deletions(-) rename migration/{unix.c => socket.c} (65%) diff --git a/migration/Makefile.objs b/migration/Makefile.objs index a5f8a03..9d83997 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += migration.o tcp.o unix.o +common-obj-y += migration.o tcp.o socket.o common-obj-y += vmstate.o common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o common-obj-y += qemu-file-channel.o diff --git a/migration/unix.c b/migration/socket.c similarity index 65% rename from migration/unix.c rename to migration/socket.c index 75205d4..a9911d6 100644 --- a/migration/unix.c +++ b/migration/socket.c @@ -38,42 +38,49 @@ static SocketAddress *unix_build_address(const char *path) } -static void unix_outgoing_migration(Object *src, - Error *err, - gpointer opaque) +static void socket_outgoing_migration(Object *src, + Error *err, + gpointer opaque) { MigrationState *s = opaque; QIOChannel *sioc = QIO_CHANNEL(src); if (err) { - trace_migration_unix_outgoing_error(error_get_pretty(err)); + trace_migration_socket_outgoing_error(error_get_pretty(err)); s->to_dst_file = NULL; migrate_fd_error(s, err); } else { - trace_migration_unix_outgoing_connected(); + trace_migration_socket_outgoing_connected(); migration_set_outgoing_channel(s, sioc); } object_unref(src); } - -void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) +static void socket_start_outgoing_migration(MigrationState *s, + SocketAddress *saddr, + Error **errp) { - SocketAddress *saddr = unix_build_address(path); - QIOChannelSocket *sioc; - sioc = qio_channel_socket_new(); + QIOChannelSocket *sioc = qio_channel_socket_new(); qio_channel_socket_connect_async(sioc, saddr, - unix_outgoing_migration, + socket_outgoing_migration, s, NULL); qapi_free_SocketAddress(saddr); } +void unix_start_outgoing_migration(MigrationState *s, + const char *path, + Error **errp) +{ + SocketAddress *saddr = unix_build_address(path); + socket_start_outgoing_migration(s, saddr, errp); +} + -static gboolean unix_accept_incoming_migration(QIOChannel *ioc, - GIOCondition condition, - gpointer opaque) +static gboolean socket_accept_incoming_migration(QIOChannel *ioc, + GIOCondition condition, + gpointer opaque) { QIOChannelSocket *sioc; Error *err = NULL; @@ -86,7 +93,7 @@ static gboolean unix_accept_incoming_migration(QIOChannel *ioc, goto out; } - trace_migration_unix_incoming_accepted(); + trace_migration_socket_incoming_accepted(); migration_set_incoming_channel(migrate_get_current(), QIO_CHANNEL(sioc)); @@ -99,12 +106,11 @@ out: } -void unix_start_incoming_migration(const char *path, Error **errp) +static void socket_start_incoming_migration(SocketAddress *saddr, + Error **errp) { - SocketAddress *saddr = unix_build_address(path); - QIOChannelSocket *listen_ioc; + QIOChannelSocket *listen_ioc = qio_channel_socket_new(); - listen_ioc = qio_channel_socket_new(); if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { object_unref(OBJECT(listen_ioc)); qapi_free_SocketAddress(saddr); @@ -113,9 +119,14 @@ void unix_start_incoming_migration(const char *path, Error **errp) qio_channel_add_watch(QIO_CHANNEL(listen_ioc), G_IO_IN, - unix_accept_incoming_migration, + socket_accept_incoming_migration, listen_ioc, (GDestroyNotify)object_unref); - qapi_free_SocketAddress(saddr); } + +void unix_start_incoming_migration(const char *path, Error **errp) +{ + SocketAddress *saddr = unix_build_address(path); + socket_start_incoming_migration(saddr, errp); +} diff --git a/trace-events b/trace-events index 2db3a53..5026d1a 100644 --- a/trace-events +++ b/trace-events @@ -1598,10 +1598,10 @@ postcopy_ram_incoming_cleanup_entry(void) "" postcopy_ram_incoming_cleanup_exit(void) "" postcopy_ram_incoming_cleanup_join(void) "" -# migration/unix.c -migration_unix_incoming_accepted(void) "" -migration_unix_outgoing_connected(void) "" -migration_unix_outgoing_error(const char *err) "error=%s" +# migration/socket.c +migration_socket_incoming_accepted(void) "" +migration_socket_outgoing_connected(void) "" +migration_socket_outgoing_error(const char *err) "error=%s" # kvm-all.c kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"