From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTThM-0003Y1-QY for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTThH-0000NX-Gy for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:30:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTThH-0000MO-80 for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:30:47 -0400 Message-ID: <5090E19B.1070806@redhat.com> Date: Wed, 31 Oct 2012 09:30:19 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <20121030231419.GA19828@amt.cnet> In-Reply-To: <20121030231419.GA19828@amt.cnet> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] acpi_piix4: fix migration of gpe fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti Cc: Anthony Liguori , qemu-devel@nongnu.org, kvm , Juan Quintela Il 31/10/2012 00:14, Marcelo Tosatti ha scritto: > > Migrate 16 bytes for en/sts fields (which is the correct size), > increase version to 3, and document how to support incoming > migration from qemu-kvm 1.2. > > Signed-off-by: Marcelo Tosatti > > diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c > index 15275cf..519269a 100644 > --- a/hw/acpi_piix4.c > +++ b/hw/acpi_piix4.c > @@ -235,10 +235,9 @@ static int vmstate_acpi_post_load(void *opaque, int version_id) > { \ > .name = (stringify(_field)), \ > .version_id = 0, \ > - .num = GPE_LEN, \ > .info = &vmstate_info_uint16, \ > .size = sizeof(uint16_t), \ > - .flags = VMS_ARRAY | VMS_POINTER, \ > + .flags = VMS_SINGLE | VMS_POINTER, \ > .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ > } > > @@ -267,11 +266,54 @@ static const VMStateDescription vmstate_pci_status = { > } > }; > > +static int acpi_load_old(QEMUFile *f, void *opaque, int version_id) > +{ > + PIIX4PMState *s = opaque; > + int ret, i; > + uint16_t temp; > + > + ret = pci_device_load(&s->dev, f); > + if (ret < 0) { > + return ret; > + } > + qemu_get_be16s(f, &s->ar.pm1.evt.sts); > + qemu_get_be16s(f, &s->ar.pm1.evt.en); > + qemu_get_be16s(f, &s->ar.pm1.cnt.cnt); > + > + ret = vmstate_load_state(f, &vmstate_apm, opaque, 1); > + if (ret) { > + return ret; > + } > + > + qemu_get_timer(f, s->ar.tmr.timer); > + qemu_get_sbe64s(f, &s->ar.tmr.overflow_time); > + > + qemu_get_be16s(f, (uint16_t *)s->ar.gpe.sts); > + for (i = 0; i < 3; i++) { > + qemu_get_be16s(f, &temp); > + } > + > + qemu_get_be16s(f, (uint16_t *)s->ar.gpe.en); > + for (i = 0; i < 3; i++) { > + qemu_get_be16s(f, &temp); > + } > + > + ret = vmstate_load_state(f, &vmstate_pci_status, opaque, 1); > + return ret; > +} > + > +/* qemu-kvm 1.2 uses version 3 but advertised as 2 > + * To support incoming qemu-kvm 1.2 migration, change version_id > + * and minimum_version_id to 2 below (which breaks migration from > + * qemu 1.2). > + * > + */ > static const VMStateDescription vmstate_acpi = { > .name = "piix4_pm", > - .version_id = 2, > - .minimum_version_id = 1, > + .version_id = 3, > + .minimum_version_id = 3, > .minimum_version_id_old = 1, > + .load_state_old = acpi_load_old, > .post_load = vmstate_acpi_post_load, > .fields = (VMStateField []) { > VMSTATE_PCI_DEVICE(dev, PIIX4PMState), > ACK Paolo