Bump, this really should make 0.13. Thanks,
Alex
On Tue, 2010-07-20 at 08:19 -0600, Alex Williamson wrote:
> If we save more than once we need to reset the last block info or else
> only the first save has the actual block info and each subsequent save
> will only use continue flags, making them unloadable independently.
>
> Found-by: Miguel Di Ciurcio Filho <miguel.fi...@gmail.com>
> Signed-off-by: Alex Williamson <alex.william...@redhat.com>
> ---
>
> Anthony, this fixes a regression caused by the new migration code and
> should be queued for 0.13. Thanks,
>
> Alex
>
> arch_init.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch_init.c b/arch_init.c
> index 47bb4b2..e0bd18c 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -104,10 +104,11 @@ static int is_dup_page(uint8_t *page, uint8_t ch)
> return 1;
> }
>
> +static RAMBlock *last_block;
> +static ram_addr_t last_offset;
> +
> static int ram_save_block(QEMUFile *f)
> {
> - static RAMBlock *last_block = NULL;
> - static ram_addr_t last_offset = 0;
> RAMBlock *block = last_block;
> ram_addr_t offset = last_offset;
> ram_addr_t current_addr;
> @@ -231,6 +232,8 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage,
> void *opaque)
> if (stage == 1) {
> RAMBlock *block;
> bytes_transferred = 0;
> + last_block = NULL;
> + last_offset = 0;
>
> /* Make sure all dirty bits are set */
> QLIST_FOREACH(block, &ram_list.blocks, next) {
>
