[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 05/12] rdma: introduce qemu_file_mode_is_not_vali
From: |
mrhines |
Subject: |
[Qemu-devel] [PATCH v5 05/12] rdma: introduce qemu_file_mode_is_not_valid() |
Date: |
Mon, 22 Apr 2013 21:55:32 -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 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
- [Qemu-devel] [PATCH v5 11/12] rdma: core logic, (continued)
- [Qemu-devel] [PATCH v5 11/12] rdma: core logic, mrhines, 2013/04/21
- [Qemu-devel] [PATCH v5 12/12] rdma: send pc.ram, mrhines, 2013/04/21
- [Qemu-devel] [PATCH v5 07/12] rdma: introduce ram_handle_compressed(), mrhines, 2013/04/21
- [Qemu-devel] [PATCH v5 01/12] rdma: add documentation, mrhines, 2013/04/21
- [Qemu-devel] [PATCH v5 02/12] rdma: export yield_until_fd_readable(), mrhines, 2013/04/21
- [Qemu-devel] [PATCH v5 00/12] rdma: migration support, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 03/12] rdma: export throughput w/ MigrationStats QMP, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 04/12] rdma: introduce qemu_get_max_size(), mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 05/12] rdma: introduce qemu_file_mode_is_not_valid(),
mrhines <=
- [Qemu-devel] [PATCH v5 07/12] rdma: introduce ram_handle_compressed(), mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 01/12] rdma: add documentation, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 06/12] rdma: export qemu_fflush(), mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 08/12] rdma: introduce qemu_ram_foreach_block(), mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 10/12] rdma: introduce capability x-rdma-pin-all, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 09/12] rdma: new QEMUFileOps hooks, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 12/12] rdma: send pc.ram, mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 02/12] rdma: export yield_until_fd_readable(), mrhines, 2013/04/22
- [Qemu-devel] [PATCH v5 11/12] rdma: core logic, mrhines, 2013/04/22