From patchwork Mon Mar 20 12:02:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hahn X-Patchwork-Id: 9633929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AFB006020B for ; Mon, 20 Mar 2017 12:02:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 984D727F54 for ; Mon, 20 Mar 2017 12:02:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C4872842C; Mon, 20 Mar 2017 12:02:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B660D27F54 for ; Mon, 20 Mar 2017 12:02:47 +0000 (UTC) Received: from localhost ([::1]:60830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpw1N-0005uX-LB for patchwork-qemu-devel@patchwork.kernel.org; Mon, 20 Mar 2017 08:02:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpw0w-0005lf-7k for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpw0t-00023W-5B for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:02:18 -0400 Received: from mail.univention.de ([82.198.197.8]:2984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpw0s-00020U-Pc for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:02:15 -0400 Received: from localhost (localhost [127.0.0.1]) by solig.knut.univention.de (Postfix) with ESMTP id 15C36180010E; Mon, 20 Mar 2017 13:02:12 +0100 (CET) X-Virus-Scanned: by amavisd-new-2.7.1 (20120429) (Debian) at knut.univention.de Received: from mail.univention.de ([127.0.0.1]) by localhost (solig.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vlyu5IvhDrTD; Mon, 20 Mar 2017 13:02:10 +0100 (CET) Received: from [192.168.0.82] (mail.univention.de [82.198.197.8]) by solig.knut.univention.de (Postfix) with ESMTPSA id B09C7180010A; Mon, 20 Mar 2017 13:02:10 +0100 (CET) To: Marcelo Tosatti References: From: Philipp Hahn X-Enigmail-Draft-Status: N1110 Organization: Univention GmbH Message-ID: Date: Mon, 20 Mar 2017 13:02:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 82.198.197.8 Subject: Re: [Qemu-devel] [PATCH 1/2] acpi_piix4: fix migration of gpe fields X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anthony Liguori , qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hello Marcelo, cc:qemu, Sorry for re-using this old thread, but I have a problem loading some saved state from qemu-kvm-1.1.2, which fails for piix4_pm. You following patch was committed as : Am 15.11.2012 um 01:11 schrieb Marcelo Tosatti: > 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. I my case qemu-kvm-1.1.2/hw/acpi_piix4.c:284 | VMSTATE_STRUCT(ar.gpe, PIIX4PMState, 2, vmstate_gpe, ACPIGPE), only saves 4 bytes, not 16 bytes. > Acked-by: Paolo Bonzini > Signed-off-by: Marcelo Tosatti > --- > hw/acpi_piix4.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- > 1 files changed, 46 insertions(+), 4 deletions(-) > > 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 = { > } > }; On load qemu-2.8 uses this function > +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); > + } and the loop loads 6 extra bytes here > + > + qemu_get_be16s(f, (uint16_t *)s->ar.gpe.en); > + for (i = 0; i < 3; i++) { > + qemu_get_be16s(f, &temp); > + } and 6 here. So in total 12 bytes are read too much and qemu_loadvm_state() ends somewhere in the middle of the next device state section. (patch 0001 helped me to identify that offset) If I apply the attached 0002 patch, I can load the old VM state. > + > + 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), > Do you remember why 16 bytes were saved in your case? Thank you in advance. Philipp From 1313efdc0ac664169c5c271f832264efe6659743 Mon Sep 17 00:00:00 2001 Message-Id: <1313efdc0ac664169c5c271f832264efe6659743.1490011194.git.hahn@univention.de> From: Philipp Hahn Date: Fri, 17 Mar 2017 12:51:01 +0100 Subject: [PATCH 1/2] 0006-Bug-38877-debug-loadvm-offset Organization: Univention GmbH, Bremen, Germany To: qemu-devel@nongnu.org debug: Print offset on section error: 30143@1489751176.344102:qemu_loadvm_state_section 48@0x364da2 Gbp: Topic debug Signed-off-by: Philipp Hahn --- include/migration/qemu-file.h | 1 + migration/qemu-file.c | 5 +++++ migration/savevm.c | 2 +- migration/trace-events | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index abedd46..a570836 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -126,6 +126,7 @@ int qemu_get_fd(QEMUFile *f); int qemu_fclose(QEMUFile *f); int64_t qemu_ftell(QEMUFile *f); int64_t qemu_ftell_fast(QEMUFile *f); +int64_t qemu_ftell_internal(QEMUFile *f); void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size); void qemu_put_byte(QEMUFile *f, int v); /* diff --git a/migration/qemu-file.c b/migration/qemu-file.c index e9fae31..862b8c7 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -543,6 +543,11 @@ int64_t qemu_ftell(QEMUFile *f) return f->pos; } +int64_t qemu_ftell_internal(QEMUFile *f) +{ + return f->pos - f->buf_size + f->buf_index; +} + int qemu_file_rate_limit(QEMUFile *f) { if (qemu_file_get_error(f)) { diff --git a/migration/savevm.c b/migration/savevm.c index 0363372..da2a98b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1882,7 +1882,7 @@ static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis) while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { ret = 0; - trace_qemu_loadvm_state_section(section_type); + trace_qemu_loadvm_state_section(section_type, qemu_ftell_internal(f) - 1); switch (section_type) { case QEMU_VM_SECTION_START: case QEMU_VM_SECTION_FULL: diff --git a/migration/trace-events b/migration/trace-events index 94134f7..49f8458 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -1,7 +1,7 @@ # See docs/tracing.txt for syntax documentation. # migration/savevm.c -qemu_loadvm_state_section(unsigned int section_type) "%d" +qemu_loadvm_state_section(unsigned int section_type, uint64_t offset) "%d@0x%" PRIx64 qemu_loadvm_state_section_command(int ret) "%d" qemu_loadvm_state_section_partend(uint32_t section_id) "%u" qemu_loadvm_state_main(void) "" -- 2.1.4