* [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate
@ 2020-11-12 2:06 Peng Liang
2020-11-12 8:56 ` Michael S. Tsirkin
2020-11-12 14:14 ` Dr. David Alan Gilbert
0 siblings, 2 replies; 3+ messages in thread
From: Peng Liang @ 2020-11-12 2:06 UTC (permalink / raw)
To: qemu-devel
Cc: zhang.zhanghailiang, mst, dgilbert, xiexiangyou, liangpeng10,
imammedo
There is a field with vmstate_ghes_state as vmsd in vmstate_ghes_state,
which will lead to infinite recursion in dump_vmstate_vmsd.
Fixes: a08a64627b ("ACPI: Record the Generic Error Status Block address")
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
---
hw/acpi/generic_event_device.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 6df400e1ee16..5454be67d5f0 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -322,6 +322,16 @@ static const VMStateDescription vmstate_ged_state = {
}
};
+static const VMStateDescription vmstate_ghes = {
+ .name = "acpi-ghes",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT64(ghes_addr_le, AcpiGhesState),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
static bool ghes_needed(void *opaque)
{
AcpiGedState *s = opaque;
@@ -335,7 +345,7 @@ static const VMStateDescription vmstate_ghes_state = {
.needed = ghes_needed,
.fields = (VMStateField[]) {
VMSTATE_STRUCT(ghes_state, AcpiGedState, 1,
- vmstate_ghes_state, AcpiGhesState),
+ vmstate_ghes, AcpiGhesState),
VMSTATE_END_OF_LIST()
}
};
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate
2020-11-12 2:06 [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate Peng Liang
@ 2020-11-12 8:56 ` Michael S. Tsirkin
2020-11-12 14:14 ` Dr. David Alan Gilbert
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2020-11-12 8:56 UTC (permalink / raw)
To: Peng Liang
Cc: imammedo, zhang.zhanghailiang, qemu-devel, xiexiangyou, dgilbert
On Thu, Nov 12, 2020 at 10:06:38AM +0800, Peng Liang wrote:
> There is a field with vmstate_ghes_state as vmsd in vmstate_ghes_state,
> which will lead to infinite recursion in dump_vmstate_vmsd.
>
> Fixes: a08a64627b ("ACPI: Record the Generic Error Status Block address")
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Peng Liang <liangpeng10@huawei.com>
> Acked-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/acpi/generic_event_device.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 6df400e1ee16..5454be67d5f0 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -322,6 +322,16 @@ static const VMStateDescription vmstate_ged_state = {
> }
> };
>
> +static const VMStateDescription vmstate_ghes = {
> + .name = "acpi-ghes",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(ghes_addr_le, AcpiGhesState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static bool ghes_needed(void *opaque)
> {
> AcpiGedState *s = opaque;
> @@ -335,7 +345,7 @@ static const VMStateDescription vmstate_ghes_state = {
> .needed = ghes_needed,
> .fields = (VMStateField[]) {
> VMSTATE_STRUCT(ghes_state, AcpiGedState, 1,
> - vmstate_ghes_state, AcpiGhesState),
> + vmstate_ghes, AcpiGhesState),
> VMSTATE_END_OF_LIST()
> }
> };
> --
> 2.26.2
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate
2020-11-12 2:06 [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate Peng Liang
2020-11-12 8:56 ` Michael S. Tsirkin
@ 2020-11-12 14:14 ` Dr. David Alan Gilbert
1 sibling, 0 replies; 3+ messages in thread
From: Dr. David Alan Gilbert @ 2020-11-12 14:14 UTC (permalink / raw)
To: Peng Liang; +Cc: imammedo, zhang.zhanghailiang, qemu-devel, xiexiangyou, mst
* Peng Liang (liangpeng10@huawei.com) wrote:
> There is a field with vmstate_ghes_state as vmsd in vmstate_ghes_state,
> which will lead to infinite recursion in dump_vmstate_vmsd.
>
> Fixes: a08a64627b ("ACPI: Record the Generic Error Status Block address")
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Peng Liang <liangpeng10@huawei.com>
> Acked-by: Igor Mammedov <imammedo@redhat.com>
Queued for migration
> ---
> hw/acpi/generic_event_device.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 6df400e1ee16..5454be67d5f0 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -322,6 +322,16 @@ static const VMStateDescription vmstate_ged_state = {
> }
> };
>
> +static const VMStateDescription vmstate_ghes = {
> + .name = "acpi-ghes",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(ghes_addr_le, AcpiGhesState),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> static bool ghes_needed(void *opaque)
> {
> AcpiGedState *s = opaque;
> @@ -335,7 +345,7 @@ static const VMStateDescription vmstate_ghes_state = {
> .needed = ghes_needed,
> .fields = (VMStateField[]) {
> VMSTATE_STRUCT(ghes_state, AcpiGedState, 1,
> - vmstate_ghes_state, AcpiGhesState),
> + vmstate_ghes, AcpiGhesState),
> VMSTATE_END_OF_LIST()
> }
> };
> --
> 2.26.2
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-12 14:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-12 2:06 [PATCH v2] ACPI: Avoid infinite recursion when dump-vmstate Peng Liang
2020-11-12 8:56 ` Michael S. Tsirkin
2020-11-12 14:14 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).