[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH RDMA support v1: 06/13] implementation of new QE
From: |
mrhines |
Subject: |
[Qemu-devel] [RFC PATCH RDMA support v1: 06/13] implementation of new QEMUFileOps hooks |
Date: |
Wed, 10 Apr 2013 18:28:14 -0400 |
From: "Michael R. Hines" <address@hidden>
These are the actual definitions of the accessor methods
which call out to QEMUFileOps hooks during the RAM iteration
faces. These hooks are accessed by arch_init.c,
which comes later in the patch series.
Signed-off-by: Michael R. Hines <address@hidden>
---
savevm.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 69 insertions(+), 9 deletions(-)
diff --git a/savevm.c b/savevm.c
index b1d8988..0a20e65 100644
--- a/savevm.c
+++ b/savevm.c
@@ -409,16 +409,24 @@ 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 NULL;
+ 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;
s->fd = fd;
if (mode[0] == 'w') {
@@ -434,12 +442,8 @@ 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;
- }
s = g_malloc0(sizeof(QEMUFileStdio));
@@ -554,6 +558,62 @@ static void qemu_fflush(QEMUFile *f)
}
}
+void ram_control_before_iterate(QEMUFile *f, uint32_t flags)
+{
+ int ret = 0;
+
+ if (f->ops->before_ram_iterate) {
+ qemu_fflush(f);
+ ret = f->ops->before_ram_iterate(f, f->opaque, flags);
+ if (ret < 0)
+ qemu_file_set_error(f, ret);
+ }
+}
+
+void ram_control_after_iterate(QEMUFile *f, uint32_t flags)
+{
+ int ret = 0;
+
+ if (f->ops->after_ram_iterate) {
+ qemu_fflush(f);
+ ret = f->ops->after_ram_iterate(f, f->opaque, flags);
+ if (ret < 0)
+ qemu_file_set_error(f, ret);
+ }
+}
+
+void ram_control_load_hook(QEMUFile *f, uint32_t flags)
+{
+ int ret = 0;
+
+ if (f->ops->hook_ram_load) {
+ qemu_fflush(f);
+ ret = f->ops->hook_ram_load(f, f->opaque, flags);
+ if (ret < 0)
+ qemu_file_set_error(f, ret);
+ }
+}
+
+size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
+ ram_addr_t offset, int cont,
+ size_t size, bool zero)
+{
+ if (f->ops->save_page) {
+ size_t bytes;
+
+ qemu_fflush(f);
+
+ bytes = f->ops->save_page(f, f->opaque, block_offset, offset, cont,
size, zero);
+
+ if (bytes > 0)
+ f->pos += bytes;
+
+ return bytes;
+ }
+
+ return -ENOTSUP;
+}
+
static void qemu_fill_buffer(QEMUFile *f)
{
int len;
--
1.7.10.4
- [Qemu-devel] [RFC PATCH RDMA support v7: 00/13] rdma cleanup and reordering, mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 01/13] introduce qemu_ram_foreach_block(), mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 05/13] accessor function prototypes for new QEMUFileOps hooks, mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 06/13] implementation of new QEMUFileOps hooks,
mrhines <=
- [Qemu-devel] [RFC PATCH RDMA support v1: 07/13] introduce capability for dynamic chunk registration, mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 04/13] update QEMUFileOps with new hooks, mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 08/13] default chunk registration to true, mrhines, 2013/04/10
- [Qemu-devel] [RFC PATCH RDMA support v1: 10/13] introduce new command migrate_check_for_zero, mrhines, 2013/04/10