[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 04/11] rdma: introduce qemu_file_mode_is_not_vali
From: |
mrhines |
Subject: |
[Qemu-devel] [PATCH v6 04/11] rdma: introduce qemu_file_mode_is_not_valid() |
Date: |
Wed, 24 Apr 2013 15:00:49 -0400 |
From: "Michael R. Hines" <address@hidden>
QEMUFileRDMA also has read and write modes. This function is now
shared to reduce code duplication.
Signed-off-by: Michael R. Hines <address@hidden>
---
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 7519464..7e097c1 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -80,6 +80,7 @@ void qemu_put_byte(QEMUFile *f, int v);
* The buffer should be available till it is sent asynchronously.
*/
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)
{
diff --git a/savevm.c b/savevm.c
index 4dbfa16..28334e7 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
- [Qemu-devel] [PATCH v6 00/11] rdma: migration support, mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 02/11] rdma: export yield_until_fd_readable(), mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 04/11] rdma: introduce qemu_file_mode_is_not_valid(),
mrhines <=
- [Qemu-devel] [PATCH v6 08/11] rdma: new QEMUFileOps hooks, mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 03/11] rdma: export throughput w/ MigrationStats QMP, mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 05/11] rdma: export qemu_fflush(), mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 09/11] rdma: introduce capability x-rdma-pin-all, mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 06/11] rdma: introduce ram_handle_compressed(), mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 10/11] rdma: core logic, mrhines, 2013/04/24
- [Qemu-devel] [PATCH v6 11/11] rdma: send pc.ram, mrhines, 2013/04/24