From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQNSJ-0003fD-L8 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 16:55:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQNS6-0008Vz-LE for qemu-devel@nongnu.org; Tue, 24 Feb 2015 16:55:51 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:41561) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQNS6-0008Vi-EJ for qemu-devel@nongnu.org; Tue, 24 Feb 2015 16:55:38 -0500 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Feb 2015 14:55:37 -0700 From: Michael Roth Date: Tue, 24 Feb 2015 15:48:15 -0600 Message-Id: <1424814498-6993-41-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1424814498-6993-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1424814498-6993-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 40/43] fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Zhang Haoyu , qemu-stable@nongnu.org, Juan Quintela From: Zhang Haoyu fix mc146818rtc wrong subsection name to avoid vmstate_subsection_load() fail during incoming migration or loadvm. Signed-off-by: Zhang Haoyu Reviewed-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit bb426311901776b95b021cece831b69dce4ef5ee) Signed-off-by: Michael Roth --- hw/timer/mc146818rtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index f18d128..9373e18 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -734,7 +734,7 @@ static int rtc_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { - .name = "irq_reinject_on_ack_count", + .name = "mc146818rtc/irq_reinject_on_ack_count", .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { -- 1.9.1