diff options
| author | Avi Kivity <avi@redhat.com> | 2011-12-21 13:22:16 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-01-04 13:34:48 +0200 |
| commit | 8fec98b41b0535ea4823c59ee9bf7d768feac74a (patch) | |
| tree | 2a9c39cfba3f6a2cb6362d7ea3f2a0775e8e6086 | |
| parent | 71c510e26e4d90690966a70cb14d9c6e7ab5ba4e (diff) | |
| download | qemu-8fec98b41b0535ea4823c59ee9bf7d768feac74a.tar.gz qemu-8fec98b41b0535ea4823c59ee9bf7d768feac74a.tar.bz2 qemu-8fec98b41b0535ea4823c59ee9bf7d768feac74a.zip | |
Sort RAMBlocks by ID for migration, not by ram_addr
ram_addr is (a) unstable (b) going away. Sort by idstr instead.
Commit b2e0a138e initially introduced the sorting for the purpose
of improving debuggability. After this patch, the order is still
stable, but perhaps less usable by a human.
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch_init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch_init.c b/arch_init.c index c73fa1b2cb..5df84048a2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -217,12 +217,8 @@ static int block_compar(const void *a, const void *b) { RAMBlock * const *ablock = a; RAMBlock * const *bblock = b; - if ((*ablock)->offset < (*bblock)->offset) { - return -1; - } else if ((*ablock)->offset > (*bblock)->offset) { - return 1; - } - return 0; + + return strcmp((*ablock)->idstr, (*bblock)->idstr); } static void sort_ram_list(void) |