From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar1JJ-0001vy-0y for qemu-devel@nongnu.org; Fri, 15 Apr 2016 06:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar1JF-00044o-QO for qemu-devel@nongnu.org; Fri, 15 Apr 2016 06:49:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar1JF-00044j-Jz for qemu-devel@nongnu.org; Fri, 15 Apr 2016 06:49:09 -0400 References: <20160401175819.GK2242@work-vm> <570244B3.4070105@redhat.com> From: Paolo Bonzini Message-ID: <5710C71C.2070901@redhat.com> Date: Fri, 15 Apr 2016 12:49:00 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] efi var store migration assert (bdrv_co_do_pwritev: Assertion `!(bs->open_flags & 0x0800)' failed.) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: "Dr. David Alan Gilbert" , QEMU Developers , John Snow On 14/04/2016 17:30, Peter Maydell wrote: > On 4 April 2016 at 11:40, Paolo Bonzini wrote: >> >> >> On 01/04/2016 19:58, Dr. David Alan Gilbert wrote: >>> In the continuing journeys of trying to migrate a q35 guest with ovmf, >>> I've just hit this assert: >>> >>> qemu-system-x86_64: /root/git/qemu/block/io.c:1297: bdrv_co_do_pwritev: Assertion `!(bs->open_flags & 0x0800)' failed. >>> >>> This is just ahead of rc0 - 1458317c8ada834cf39287f6d11a8cb8a37360d6 from yesterday. >> >> Try this... > > Hi Paolo -- this bug is on the list of "things we should probably > fix for 2.6", but your fix below doesn't have your Signed-off-by > line. Were you planning to send this as a proper patch, or could > you provide an s-o-b line so somebody else (David?) can take the > code and clean it up into an actual patch? Indeed. I had sent the S-o-b to David, but that was a private email so Signed-off-by: Paolo Bonzini Thanks, Paolo > thanks > -- PMM > >> >> Paolo >> >> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c >> index c475c2a..e96a7b0 100644 >> --- a/hw/block/pflash_cfi01.c >> +++ b/hw/block/pflash_cfi01.c >> @@ -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,24 @@ MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl) >> 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) >> { >> pflash_t *pfl = opaque; >> >> if (!pfl->ro) { >> - DPRINTF("%s: updating bdrv for %s\n", __func__, pfl->name); >> - pflash_update(pfl, 0, pfl->sector_len * pfl->nb_blocs); >> + pfl->vmstate = qemu_add_vm_change_state_handler(postload_update_cb, pfl); >> } >> return 0; >> }