From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUSSZ-0004pK-Kq for qemu-devel@nongnu.org; Mon, 22 Apr 2013 21:56:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUSSV-0001F0-4l for qemu-devel@nongnu.org; Mon, 22 Apr 2013 21:55:55 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:36714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUSSU-0001En-TJ for qemu-devel@nongnu.org; Mon, 22 Apr 2013 21:55:51 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 22 Apr 2013 19:55:50 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id BA21719D8043 for ; Mon, 22 Apr 2013 19:55:41 -0600 (MDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3N1tkTH135390 for ; Mon, 22 Apr 2013 19:55:46 -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 r3N1wcWU012845 for ; Mon, 22 Apr 2013 19:58:38 -0600 From: mrhines@linux.vnet.ibm.com Date: Mon, 22 Apr 2013 21:55:32 -0400 Message-Id: <1366682139-22122-6-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1366682139-22122-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1366682139-22122-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v5 05/12] rdma: introduce qemu_file_mode_is_not_valid() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: quintela@redhat.com Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, 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 | 1 + savevm.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 1803aeb..c1d8b0f 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -93,6 +93,7 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size); double qemu_get_mbps(void); size_t qemu_get_max_size(QEMUFile *f, uint64_t transferred_bytes, uint64_t time_spent, uint64_t max_downtime); +bool qemu_file_mode_is_not_valid(const char *mode); static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) diff --git a/savevm.c b/savevm.c index 60776e5..cafe6ac 100644 --- a/savevm.c +++ b/savevm.c @@ -447,14 +447,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; } @@ -472,10 +481,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