|
 |
9ae3a8 |
From e7b184d50f2723ae82e35251ad8f05ec1cddb034 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <e7b184d50f2723ae82e35251ad8f05ec1cddb034.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Nigel Croxon <ncroxon@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 14 Nov 2013 22:52:44 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 08/46] rdma: introduce qemu_file_mode_is_not_valid()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Nigel Croxon <ncroxon@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1384469598-13137-9-git-send-email-ncroxon@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55692
|
|
|
9ae3a8 |
O-Subject: [RHEL7.0 PATCH 08/42] rdma: introduce qemu_file_mode_is_not_valid()
|
|
|
9ae3a8 |
Bugzilla: 1011720
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1011720
|
|
|
9ae3a8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1011720
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
>From commit ID:
|
|
|
9ae3a8 |
commit bc1256f7f187cc7d491bfe3861249a60873adbbc
|
|
|
9ae3a8 |
Author: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
9ae3a8 |
Date: Tue Jun 25 21:35:31 2013 -0400
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
rdma: introduce qemu_file_mode_is_not_valid()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
QEMUFileRDMA also has read and write modes. This function is now
|
|
|
9ae3a8 |
shared to reduce code duplication.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Chegu Vinod <chegu_vinod@hp.com>
|
|
|
9ae3a8 |
Tested-by: Chegu Vinod <chegu_vinod@hp.com>
|
|
|
9ae3a8 |
Tested-by: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/migration/qemu-file.h | 1 +
|
|
|
9ae3a8 |
savevm.c | 20 +++++++++++++-------
|
|
|
9ae3a8 |
2 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/migration/qemu-file.h | 1 +
|
|
|
9ae3a8 |
savevm.c | 20 +++++++++++++-------
|
|
|
9ae3a8 |
2 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
|
|
|
9ae3a8 |
index fb1cf40..37d1604 100644
|
|
|
9ae3a8 |
--- a/include/migration/qemu-file.h
|
|
|
9ae3a8 |
+++ b/include/migration/qemu-file.h
|
|
|
9ae3a8 |
@@ -80,6 +80,7 @@ void qemu_put_byte(QEMUFile *f, int v);
|
|
|
9ae3a8 |
* The buffer should be available till it is sent asynchronously.
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size);
|
|
|
9ae3a8 |
+bool qemu_file_mode_is_not_valid(const char *mode);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
diff --git a/savevm.c b/savevm.c
|
|
|
9ae3a8 |
index 9304788..26d5607 100644
|
|
|
9ae3a8 |
--- a/savevm.c
|
|
|
9ae3a8 |
+++ b/savevm.c
|
|
|
9ae3a8 |
@@ -449,14 +449,23 @@ static const QEMUFileOps socket_write_ops = {
|
|
|
9ae3a8 |
.close = socket_close
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-QEMUFile *qemu_fopen_socket(int fd, const char *mode)
|
|
|
9ae3a8 |
+bool qemu_file_mode_is_not_valid(const char *mode)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- QEMUFileSocket *s;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
if (mode == NULL ||
|
|
|
9ae3a8 |
(mode[0] != 'r' && mode[0] != 'w') ||
|
|
|
9ae3a8 |
mode[1] != 'b' || mode[2] != 0) {
|
|
|
9ae3a8 |
fprintf(stderr, "qemu_fopen: Argument validity check failed\n");
|
|
|
9ae3a8 |
+ return true;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return false;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+QEMUFile *qemu_fopen_socket(int fd, const char *mode)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ QEMUFileSocket *s;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (qemu_file_mode_is_not_valid(mode)) {
|
|
|
9ae3a8 |
return NULL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -475,10 +484,7 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
QEMUFileStdio *s;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (mode == NULL ||
|
|
|
9ae3a8 |
- (mode[0] != 'r' && mode[0] != 'w') ||
|
|
|
9ae3a8 |
- mode[1] != 'b' || mode[2] != 0) {
|
|
|
9ae3a8 |
- fprintf(stderr, "qemu_fopen: Argument validity check failed\n");
|
|
|
9ae3a8 |
+ if (qemu_file_mode_is_not_valid(mode)) {
|
|
|
9ae3a8 |
return NULL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|