From: Peter Maydell Date: Fri, 27 Jul 2018 11:38:53 +0000 (+0100) Subject: armv7m_nvic: Fix m-security subsection name X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=942566ffc189ad1ea09d350860d08d95597537ca;p=qemu.git armv7m_nvic: Fix m-security subsection name The vmstate save/load code insists that subsections of a VMState must have names which include their parent VMState's name as a leading substring. Unfortunately it neither documents this nor checks it on device init or state save, but instead fails state load with a confusing error message ("Missing section footer for armv7m_nvic"). Fix the name of the m-security subsection of the NVIC, so that state save/load works correctly for the security-enabled NVIC. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20180727113854.20283-2-peter.maydell@linaro.org --- diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 6be7fc5266..cd1e7f1729 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -2064,7 +2064,7 @@ static int nvic_security_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_nvic_security = { - .name = "nvic/m-security", + .name = "armv7m_nvic/m-security", .version_id = 1, .minimum_version_id = 1, .needed = nvic_security_needed,