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: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Acked-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
16aaf975ee
commit
90c647db8d
|
@ -46,6 +46,7 @@
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
|
#include "sysemu/sysemu.h"
|
||||||
|
|
||||||
#define PFLASH_BUG(fmt, ...) \
|
#define PFLASH_BUG(fmt, ...) \
|
||||||
do { \
|
do { \
|
||||||
|
@ -97,6 +98,7 @@ struct pflash_t {
|
||||||
MemoryRegion mem;
|
MemoryRegion mem;
|
||||||
char *name;
|
char *name;
|
||||||
void *storage;
|
void *storage;
|
||||||
|
VMChangeStateEntry *vmstate;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pflash_post_load(void *opaque, int version_id);
|
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;
|
return &fl->mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void postload_update_cb(void *opaque, int running, RunState state)
|
||||||
|
{
|
||||||
|
pflash_t *pfl = opaque;
|
||||||
|
|
||||||
|
/* 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)
|
static int pflash_post_load(void *opaque, int version_id)
|
||||||
{
|
{
|
||||||
pflash_t *pfl = opaque;
|
pflash_t *pfl = opaque;
|
||||||
|
|
||||||
if (!pfl->ro) {
|
if (!pfl->ro) {
|
||||||
DPRINTF("%s: updating bdrv for %s\n", __func__, pfl->name);
|
pfl->vmstate = qemu_add_vm_change_state_handler(postload_update_cb,
|
||||||
pflash_update(pfl, 0, pfl->sector_len * pfl->nb_blocs);
|
pfl);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue