{"id":812152,"url":"http://patchwork.ozlabs.org/api/patches/812152/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505054255-2990-3-git-send-email-mark.cave-ayland@ilande.co.uk/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505054255-2990-3-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-10T14:37:33","name":"[2/4] ppc: add CPU IRQ state to PPC VMStateDescription","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"24101c2fc8b09ed860b3f98e544653d19dc9abb7","submitter":{"id":12451,"url":"http://patchwork.ozlabs.org/api/people/12451/?format=json","name":"Mark Cave-Ayland","email":"mark.cave-ayland@ilande.co.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505054255-2990-3-git-send-email-mark.cave-ayland@ilande.co.uk/mbox/","series":[{"id":2404,"url":"http://patchwork.ozlabs.org/api/series/2404/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2404","date":"2017-09-10T14:37:33","name":"ppc: migration fixes for TCG","version":1,"mbox":"http://patchwork.ozlabs.org/series/2404/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812152/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812152/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xqtwZ38GYz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 11 Sep 2017 00:38:54 +1000 (AEST)","from localhost ([::1]:53205 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dr3Ns-0007e1-Cs\n\tfor incoming@patchwork.ozlabs.org; Sun, 10 Sep 2017 10:38:52 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45004)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mark.cave-ayland@ilande.co.uk>) id 1dr3N2-0007dU-PX\n\tfor qemu-devel@nongnu.org; Sun, 10 Sep 2017 10:38:01 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mark.cave-ayland@ilande.co.uk>) id 1dr3N1-0000W4-Fq\n\tfor qemu-devel@nongnu.org; Sun, 10 Sep 2017 10:38:00 -0400","from chuckie.co.uk ([82.165.15.123]:60559\n\thelo=s16892447.onlinehome-server.info)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mark.cave-ayland@ilande.co.uk>)\n\tid 1dr3N1-0000R3-99; Sun, 10 Sep 2017 10:37:59 -0400","from host109-147-184-220.range109-147.btcentralplus.com\n\t([109.147.184.220] helo=kentang.home)\n\tby s16892447.onlinehome-server.info with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76)\n\t(envelope-from <mark.cave-ayland@ilande.co.uk>)\n\tid 1dr3Mt-00066v-ME; Sun, 10 Sep 2017 15:37:52 +0100"],"From":"Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>","To":"qemu-devel@nongnu.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, \n\taik@ozlabs.ru, lvivier@redhat.com","Date":"Sun, 10 Sep 2017 15:37:33 +0100","Message-Id":"<1505054255-2990-3-git-send-email-mark.cave-ayland@ilande.co.uk>","X-Mailer":"git-send-email 1.7.10.4","In-Reply-To":"<1505054255-2990-1-git-send-email-mark.cave-ayland@ilande.co.uk>","References":"<1505054255-2990-1-git-send-email-mark.cave-ayland@ilande.co.uk>","X-SA-Exim-Connect-IP":"109.147.184.220","X-SA-Exim-Mail-From":"mark.cave-ayland@ilande.co.uk","X-SA-Exim-Version":"4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000)","X-SA-Exim-Scanned":"Yes (on s16892447.onlinehome-server.info)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"82.165.15.123","Subject":"[Qemu-devel] [PATCH 2/4] ppc: add CPU IRQ state to PPC\n\tVMStateDescription","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Commit a90db15 \"target-ppc: Convert ppc cpu savevm to VMStateDescription\"\nappears to drop the internal CPU IRQ state from the migration stream. Whilst\ntesting migration on g3beige/mac99 machines, test images would randomly fail to\nresume unless a key was pressed on the VGA console.\n\nFurther investigation suggests that internal CPU IRQ state isn't being\npreserved and so interrupts asserted at the time of migration are lost. Adding\nthe pending_interrupts and irq_input_state fields back into the migration\nstream appears to fix the problem here during local tests.\n\nAs part of this commit we bump the vmstate_ppc version from 5 to 6 to handle\nthe additional fields.\n\nSigned-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>\n---\n target/ppc/machine.c |    6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)","diff":"diff --git a/target/ppc/machine.c b/target/ppc/machine.c\nindex e59049f..8fec1a4 100644\n--- a/target/ppc/machine.c\n+++ b/target/ppc/machine.c\n@@ -647,7 +647,7 @@ static const VMStateDescription vmstate_compat = {\n \n const VMStateDescription vmstate_ppc_cpu = {\n     .name = \"cpu\",\n-    .version_id = 5,\n+    .version_id = 6,\n     .minimum_version_id = 5,\n     .minimum_version_id_old = 4,\n     .load_state_old = cpu_load_old,\n@@ -678,6 +678,10 @@ const VMStateDescription vmstate_ppc_cpu = {\n         VMSTATE_UINTTL(env.hflags_nmsr, PowerPCCPU),\n         /* FIXME: access_type? */\n \n+        /* Interrupt state */\n+        VMSTATE_UINT32_V(env.pending_interrupts, PowerPCCPU, 6),\n+        VMSTATE_UINT32_V(env.irq_input_state, PowerPCCPU, 6),\n+\n         /* Sanity checking */\n         VMSTATE_UINTTL_TEST(mig_msr_mask, PowerPCCPU, cpu_pre_2_8_migration),\n         VMSTATE_UINT64_TEST(mig_insns_flags, PowerPCCPU, cpu_pre_2_8_migration),\n","prefixes":["2/4"]}