From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBXwI-0000N7-Es for qemu-devel@nongnu.org; Thu, 18 May 2017 22:46:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBXwF-0008Pb-C2 for qemu-devel@nongnu.org; Thu, 18 May 2017 22:46:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBXwF-0008PP-2R for qemu-devel@nongnu.org; Thu, 18 May 2017 22:46:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBB21C056828 for ; Fri, 19 May 2017 02:46:45 +0000 (UTC) Date: Fri, 19 May 2017 10:46:41 +0800 From: Peter Xu Message-ID: <20170519024641.GC15294@pxdev.xzpeter.org> References: <20170517154756.22079-1-quintela@redhat.com> <20170517154756.22079-4-quintela@redhat.com> <20170518120710.GE24085@pxdev.xzpeter.org> <871srm9tz4.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <871srm9tz4.fsf@secure.mitica> Subject: Re: [Qemu-devel] [PATCH 3/9] migration: Export qemu-file-channel.c functions in its own file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, lvivier@redhat.com On Thu, May 18, 2017 at 03:26:23PM +0200, Juan Quintela wrote: > Peter Xu wrote: > > On Wed, May 17, 2017 at 05:47:50PM +0200, Juan Quintela wrote: > >> Signed-off-by: Juan Quintela > >> --- > >> include/migration/migration.h | 1 + > >> include/migration/qemu-file.h | 4 ---- > >> migration/channel.c | 1 + > >> migration/colo.c | 1 + > >> migration/migration.c | 1 + > >> migration/qemu-file-channel.c | 1 + > >> migration/qemu-file-channel.h | 21 +++++++++++++++++++++ > >> migration/rdma.c | 1 + > >> migration/savevm.c | 1 + > >> tests/test-vmstate.c | 1 + > >> 10 files changed, 29 insertions(+), 4 deletions(-) > >> create mode 100644 migration/qemu-file-channel.h > >> > >> diff --git a/include/migration/migration.h b/include/migration/migration.h > >> index e831259..8280df1 100644 > >> --- a/include/migration/migration.h > >> +++ b/include/migration/migration.h > >> @@ -19,6 +19,7 @@ > >> #include "qemu/thread.h" > >> #include "qemu/notify.h" > >> #include "migration/vmstate.h" > >> +#include "io/channel.h" > > > > Could I ask why we add this line here? I thought one of the main goals > > of this series is removing things from migration.h... > > > > I remove from include/migration/qemu-file.h > > -#include "io/channel.h" > > > Because all the QIOChannel functions in qemu-file.h are moved to > qemu-file-channel.h. > > Great! > > But migration/vmstate.h includes qemu-file.h > > And migration.h includes vmstate.h > > And migration.h has this functions: > > void qemu_start_incoming_migration(const char *uri, Error **errp); > QIOChannel *ioc, > Error **errp); (In my repo, it does not need QIOChannel, which looks like: void qemu_start_incoming_migration(const char *uri, Error **errp) but it does not really matter much...) > > void migration_tls_channel_connect(MigrationState *s, > QIOChannel *ioc, > const char *hostname, > Error **errp); > > And nothing else declares the QIOChannel. > > So, the easy solution so far is to include this by now to maintain > compilation. I see. It's okay to me. (Another solution would be moving these functions outside of migration/migration.h as well since they are used by migration internally as well? Anyway we already have migration/tls.c to keep migration_tls_* functions) I'll reply to the latest version of this patch for the r-b. Thanks. -- Peter Xu