Commit 90c647db authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Kevin Wolf
Browse files

Fix pflash migration 



Pflash migration (e.g. q35 + EFI variable storage) fails
with the assert:

bdrv_co_do_pwritev: Assertion `!(bs->open_flags & 0x0800)' failed.

This avoids the problem by delaying the pflash update until after
the device loads complete.

Tested by:
  Migrating Q35/EFI vm.
  Changing efi variable content (with efiboot in the guest)
  md5sum'ing the variable file before migration and after.

This is a fix that Paolo posted in the message
  570244B3.4070105@redhat.com

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 16aaf975

hw/block/pflash_cfi01.c

+16 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "exec/address-spaces.h"

#include "qemu/host-utils.h"

#include "hw/sysbus.h"

#include "sysemu/sysemu.h"



#define PFLASH_BUG(fmt, ...) \

do { \
@@ -97,6 +98,7 @@ struct pflash_t { 
    MemoryRegion mem;

    char *name;

    void *storage;

    VMChangeStateEntry *vmstate;

};



static int pflash_post_load(void *opaque, int version_id);
@@ -944,13 +946,25 @@ MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl) 
    return &fl->mem;

}



static int pflash_post_load(void *opaque, int version_id)

static void postload_update_cb(void *opaque, int running, RunState state)

{

    pflash_t *pfl = opaque;



    if (!pfl->ro) {

    /* This is called after bdrv_invalidate_cache_all.  */

    qemu_del_vm_change_state_handler(pfl->vmstate);

    pfl->vmstate = NULL;



    DPRINTF("%s: updating bdrv for %s\n", __func__, pfl->name);

    pflash_update(pfl, 0, pfl->sector_len * pfl->nb_blocs);

}



static int pflash_post_load(void *opaque, int version_id)

{

    pflash_t *pfl = opaque;



    if (!pfl->ro) {

        pfl->vmstate = qemu_add_vm_change_state_handler(postload_update_cb,

                                                        pfl);

    }

    return 0;

}