From bfde43b79aa4f7407da28ed4eed7dee89388224f Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Wed, 2 Oct 2019 00:34:47 -0700 Subject: [PATCH] ac97: Revert to opaque type This was changed in merge conflict resolution, but using the opaque name is more consistent with QEMU convention and resolves function pointer warning in reset callback handler registration. --- hw/audio/ac97.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 85fa7229b2..952d4dfc39 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1271,8 +1271,10 @@ const MemoryRegionOps ac97_io_nabm_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static void ac97_on_reset(AC97LinkState *s) +static void ac97_on_reset(void *opaque) { + AC97LinkState *s = opaque; + reset_bm_regs (s, &s->bm_regs[0]); reset_bm_regs (s, &s->bm_regs[1]); reset_bm_regs (s, &s->bm_regs[2]);