[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/18] migration: Simplify get_qlist
From: |
Juan Quintela |
Subject: |
[PULL 17/18] migration: Simplify get_qlist |
Date: |
Wed, 29 Jan 2020 12:15:35 +0100 |
From: Eric Auger <address@hidden>
Instead of inserting read elements at the head and
then reversing the list, it is simpler to add
each element after the previous one. Introduce
QLIST_RAW_INSERT_AFTER helper and use it in
get_qlist().
Signed-off-by: Eric Auger <address@hidden>
Suggested-by: Juan Quintela <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
include/qemu/queue.h | 19 ++++++-------------
migration/vmstate-types.c | 10 +++++++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/include/qemu/queue.h b/include/qemu/queue.h
index 4d4554a7ce..19425f973f 100644
--- a/include/qemu/queue.h
+++ b/include/qemu/queue.h
@@ -515,6 +515,12 @@ union {
\
(elm);
\
(elm) = *QLIST_RAW_NEXT(elm, entry))
+#define QLIST_RAW_INSERT_AFTER(head, prev, elem, entry) do {
\
+ *QLIST_RAW_NEXT(prev, entry) = elem;
\
+ *QLIST_RAW_PREVIOUS(elem, entry) = QLIST_RAW_NEXT(prev, entry);
\
+ *QLIST_RAW_NEXT(elem, entry) = NULL;
\
+} while (0)
+
#define QLIST_RAW_INSERT_HEAD(head, elm, entry) do {
\
void *first = *QLIST_RAW_FIRST(head);
\
*QLIST_RAW_FIRST(head) = elm;
\
@@ -527,17 +533,4 @@ union {
\
}
\
} while (0)
-#define QLIST_RAW_REVERSE(head, elm, entry) do {
\
- void *iter = *QLIST_RAW_FIRST(head), *prev = NULL, *next;
\
- while (iter) {
\
- next = *QLIST_RAW_NEXT(iter, entry);
\
- *QLIST_RAW_PREVIOUS(iter, entry) = QLIST_RAW_NEXT(next, entry);
\
- *QLIST_RAW_NEXT(iter, entry) = prev;
\
- prev = iter;
\
- iter = next;
\
- }
\
- *QLIST_RAW_FIRST(head) = prev;
\
- *QLIST_RAW_PREVIOUS(prev, entry) = QLIST_RAW_FIRST(head);
\
-} while (0)
-
#endif /* QEMU_SYS_QUEUE_H */
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 1eee36773a..35e784c9d9 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -879,7 +879,7 @@ static int get_qlist(QEMUFile *f, void *pv, size_t
unused_size,
/* offset of the QLIST entry in a QLIST element */
size_t entry_offset = field->start;
int version_id = field->version_id;
- void *elm;
+ void *elm, *prev = NULL;
trace_get_qlist(field->name, vmsd->name, vmsd->version_id);
if (version_id > vmsd->version_id) {
@@ -900,9 +900,13 @@ static int get_qlist(QEMUFile *f, void *pv, size_t
unused_size,
g_free(elm);
return ret;
}
- QLIST_RAW_INSERT_HEAD(pv, elm, entry_offset);
+ if (!prev) {
+ QLIST_RAW_INSERT_HEAD(pv, elm, entry_offset);
+ } else {
+ QLIST_RAW_INSERT_AFTER(pv, prev, elm, entry_offset);
+ }
+ prev = elm;
}
- QLIST_RAW_REVERSE(pv, elm, entry_offset);
trace_get_qlist_end(field->name, vmsd->name);
return ret;
--
2.24.1
- [PULL 04/18] migration: Don't send data if we have stopped, (continued)
- [PULL 04/18] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/29
- [PULL 05/18] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/29
- [PULL 06/18] migration: Create migration_is_running(), Juan Quintela, 2020/01/29
- [PULL 11/18] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 10/18] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 09/18] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 15/18] multifd: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 12/18] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/29
- [PULL 13/18] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/29
- [PULL 17/18] migration: Simplify get_qlist,
Juan Quintela <=
- [PULL 18/18] migration/compress: compress QEMUFile is not writable, Juan Quintela, 2020/01/29
- [PULL 07/18] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/29
- [PULL 08/18] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/29
- [PULL 16/18] multifd: Split multifd code into its own file, Juan Quintela, 2020/01/29
- Re: [PULL 00/18] Pull migration patches, Peter Maydell, 2020/01/30