From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZZAW-0001PH-S4 for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:38:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZZAN-0001Ll-V2 for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:38:40 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:52981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZZAL-0001LS-Vl for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:38:31 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 Oct 2013 14:38:24 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 005A43578057 for ; Fri, 25 Oct 2013 15:38:21 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9P4c91b8126852 for ; Fri, 25 Oct 2013 15:38:10 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9P4cL8H025715 for ; Fri, 25 Oct 2013 15:38:21 +1100 Message-ID: <5269F5B9.4020700@linux.vnet.ibm.com> Date: Fri, 25 Oct 2013 12:38:17 +0800 From: Lei Li MIME-Version: 1.0 References: <1382412341-1173-1-git-send-email-lilei@linux.vnet.ibm.com> <1382412341-1173-10-git-send-email-lilei@linux.vnet.ibm.com> <526929A9.9030103@redhat.com> In-Reply-To: <526929A9.9030103@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/17] migration-local: override before_ram_iterate to send pipefd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, qemu-devel@nongnu.org, lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com On 10/24/2013 10:07 PM, Paolo Bonzini wrote: > Il 22/10/2013 04:25, Lei Li ha scritto: >> Override befor_ram_iterate to send pipefd. It will write the >> RAM_SAVE_FLAG_HOOK flags which will trigger the load hook to >> receive it. >> >> Signed-off-by: Lei Li >> --- >> migration-local.c | 26 ++++++++++++++++++++++++++ >> 1 files changed, 26 insertions(+), 0 deletions(-) >> >> diff --git a/migration-local.c b/migration-local.c >> index ed0ae6c..92c661c 100644 >> --- a/migration-local.c >> +++ b/migration-local.c >> @@ -114,6 +114,31 @@ static int qemu_local_close(void *opaque) >> return 0; >> } >> >> +static int send_pipefd(int sockfd, int pipefd); >> + >> +static int qemu_local_send_pipefd(QEMUFile *f, void *opaque, >> + uint64_t flags) >> +{ >> + QEMUFileLocal *s = opaque; >> + int ret; >> + >> + if (s->unix_page_flipping) { >> + /* Avoid sending pipe fd again in ram_save_complete() stage */ >> + if (flags != RAM_CONTROL_FINISH) { > Why not "flags == RAM_CONTROL_SETUP"? > >> + qemu_put_be64(f, RAM_SAVE_FLAG_HOOK); >> + qemu_fflush(f); >> + ret = send_pipefd(s->sockfd, s->pipefd[0]); >> + if (ret < 0) { >> + fprintf(stderr, "failed to pass pipe\n"); >> + return ret; >> + } >> + DPRINTF("pipe fd was sent\n"); >> + } >> + } >> + >> + return 0; >> +} >> + >> static const QEMUFileOps pipe_read_ops = { >> .get_fd = qemu_local_get_sockfd, >> .get_buffer = qemu_local_get_buffer, >> @@ -124,6 +149,7 @@ static const QEMUFileOps pipe_write_ops = { >> .get_fd = qemu_local_get_sockfd, >> .writev_buffer = qemu_local_writev_buffer, >> .close = qemu_local_close, >> + .before_ram_iterate = qemu_local_send_pipefd, >> }; >> >> QEMUFile *qemu_fopen_socket_local(int sockfd, const char *mode) >> > Otherwise looks good. Just want to confirm, normally, should I take these 'otherwise looks good/ok' as a 'Reviewed-by' from you If the other comment is fixed in the update version? > > Paolo > -- Lei