On 09/10/2023 11.47, Philippe Mathieu-Daudé wrote:
Fix:hw/s390x/sclpquiesce.c:90:22: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] QuiesceNotifier *qn = container_of(n, QuiesceNotifier, notifier); ^ hw/s390x/sclpquiesce.c:86:3: note: previous declaration is here } qn; ^ Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/s390x/sclpquiesce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index ce07b16884..a641089929 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -78,12 +78,10 @@ static const VMStateDescription vmstate_sclpquiesce = { } };-typedef struct QuiesceNotifier QuiesceNotifier;- -static struct QuiesceNotifier { +typedef struct QuiesceNotifier { Notifier notifier; SCLPEvent *event; -} qn; +} QuiesceNotifier;static void quiesce_powerdown_req(Notifier *n, void *opaque){ @@ -97,6 +95,8 @@ static void quiesce_powerdown_req(Notifier *n, void *opaque)static int quiesce_init(SCLPEvent *event){ + static QuiesceNotifier qn; + qn.notifier.notify = quiesce_powerdown_req; qn.event = event;
Reviewed-by: Thomas Huth <[email protected]>
