From patchwork Wed Apr 10 22:28:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 235502 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7E0C2C00C7 for ; Thu, 11 Apr 2013 08:31:09 +1000 (EST) Received: from localhost ([::1]:53944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3Xn-0002nw-JU for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2013 18:31:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3VQ-0007yT-QT for qemu-devel@nongnu.org; Wed, 10 Apr 2013 18:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ3VK-0001Ac-G7 for qemu-devel@nongnu.org; Wed, 10 Apr 2013 18:28:40 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:49319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3VK-0001AA-36 for qemu-devel@nongnu.org; Wed, 10 Apr 2013 18:28:34 -0400 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Apr 2013 16:28:33 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 10 Apr 2013 16:28:29 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 6D02E3E4003E for ; Wed, 10 Apr 2013 16:28:16 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3AMSSaS158366 for ; Wed, 10 Apr 2013 16:28:28 -0600 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3AMVF4X003272 for ; Wed, 10 Apr 2013 16:31:15 -0600 Received: from mrhinesdev.klabtestbed.com (klinux.watson.ibm.com [9.2.208.21]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3AMV9kn002979; Wed, 10 Apr 2013 16:31:14 -0600 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Wed, 10 Apr 2013 18:28:14 -0400 Message-Id: <1365632901-15470-7-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365632901-15470-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1365632901-15470-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041022-5518-0000-0000-00000D6A44B9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.159 Cc: aliguori@us.ibm.com, mst@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [RFC PATCH RDMA support v1: 06/13] implementation of new QEMUFileOps hooks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Michael R. Hines" These are the actual definitions of the accessor methods which call out to QEMUFileOps hooks during the RAM iteration faces. These hooks are accessed by arch_init.c, which comes later in the patch series. Signed-off-by: Michael R. Hines --- savevm.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 9 deletions(-) diff --git a/savevm.c b/savevm.c index b1d8988..0a20e65 100644 --- a/savevm.c +++ b/savevm.c @@ -409,16 +409,24 @@ static const QEMUFileOps socket_write_ops = { .close = socket_close }; -QEMUFile *qemu_fopen_socket(int fd, const char *mode) +bool qemu_file_mode_is_not_valid(const char * mode) { - QEMUFileSocket *s = g_malloc0(sizeof(QEMUFileSocket)); - if (mode == NULL || (mode[0] != 'r' && mode[0] != 'w') || mode[1] != 'b' || mode[2] != 0) { fprintf(stderr, "qemu_fopen: Argument validity check failed\n"); - return NULL; + return true; } + + return false; +} + +QEMUFile *qemu_fopen_socket(int fd, const char *mode) +{ + QEMUFileSocket *s = g_malloc0(sizeof(QEMUFileSocket)); + + if(qemu_file_mode_is_not_valid(mode)) + return NULL; s->fd = fd; if (mode[0] == 'w') { @@ -434,12 +442,8 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode) { QEMUFileStdio *s; - if (mode == NULL || - (mode[0] != 'r' && mode[0] != 'w') || - mode[1] != 'b' || mode[2] != 0) { - fprintf(stderr, "qemu_fopen: Argument validity check failed\n"); + if(qemu_file_mode_is_not_valid(mode)) return NULL; - } s = g_malloc0(sizeof(QEMUFileStdio)); @@ -554,6 +558,62 @@ static void qemu_fflush(QEMUFile *f) } } +void ram_control_before_iterate(QEMUFile *f, uint32_t flags) +{ + int ret = 0; + + if (f->ops->before_ram_iterate) { + qemu_fflush(f); + ret = f->ops->before_ram_iterate(f, f->opaque, flags); + if (ret < 0) + qemu_file_set_error(f, ret); + } +} + +void ram_control_after_iterate(QEMUFile *f, uint32_t flags) +{ + int ret = 0; + + if (f->ops->after_ram_iterate) { + qemu_fflush(f); + ret = f->ops->after_ram_iterate(f, f->opaque, flags); + if (ret < 0) + qemu_file_set_error(f, ret); + } +} + +void ram_control_load_hook(QEMUFile *f, uint32_t flags) +{ + int ret = 0; + + if (f->ops->hook_ram_load) { + qemu_fflush(f); + ret = f->ops->hook_ram_load(f, f->opaque, flags); + if (ret < 0) + qemu_file_set_error(f, ret); + } +} + +size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, + ram_addr_t offset, int cont, + size_t size, bool zero) +{ + if (f->ops->save_page) { + size_t bytes; + + qemu_fflush(f); + + bytes = f->ops->save_page(f, f->opaque, block_offset, offset, cont, size, zero); + + if (bytes > 0) + f->pos += bytes; + + return bytes; + } + + return -ENOTSUP; +} + static void qemu_fill_buffer(QEMUFile *f) { int len;