From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USbRx-0005qC-60 for qemu-devel@nongnu.org; Wed, 17 Apr 2013 19:07:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USbRr-0004y4-Dq for qemu-devel@nongnu.org; Wed, 17 Apr 2013 19:07:37 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:34130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USbRr-0004xs-8y for qemu-devel@nongnu.org; Wed, 17 Apr 2013 19:07:31 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 Apr 2013 19:07:31 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 8C92738C801A for ; Wed, 17 Apr 2013 19:07:27 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3HN7RgM286292 for ; Wed, 17 Apr 2013 19:07:27 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3HN7RA6022100 for ; Wed, 17 Apr 2013 20:07:27 -0300 From: mrhines@linux.vnet.ibm.com Date: Wed, 17 Apr 2013 19:07:12 -0400 Message-Id: <1366240040-10730-4-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1366240040-10730-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1366240040-10730-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PULL v4 03/11] rdma: introduce qemu_file_mode_is_not_valid() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mst@redhat.com, quintela@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com From: "Michael R. Hines" QEMUFileRDMA also has read and write modes. This function is now shared to reduce code duplication. Signed-off-by: Michael R. Hines --- include/migration/qemu-file.h | 2 ++ savevm.c | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 7519464..efc9970 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -81,6 +81,8 @@ void qemu_put_byte(QEMUFile *f, int v); */ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size); +bool qemu_file_mode_is_not_valid(const char *mode); + static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) { qemu_put_byte(f, (int)v); diff --git a/savevm.c b/savevm.c index c2e61dd..45389f0 100644 --- a/savevm.c +++ b/savevm.c @@ -381,14 +381,23 @@ 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 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; } @@ -406,10 +415,7 @@ 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; } -- 1.7.10.4