|
 |
9ae3a8 |
From ce4b6f19e7e027480606076804cc6da2cccf99ba Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 27 Oct 2014 11:45:22 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 14/19] ac97: register reset via qom
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1414410322-25041-2-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 61905
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] ac97: register reset via qom
|
|
|
9ae3a8 |
Bugzilla: 1141667
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
So it gets properly unregistered on hot-unplug.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 133771477c39f3716d9a85609aca0d3e5a77c55c)
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/audio/ac97.c | 8 ++++----
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
|
|
|
9ae3a8 |
index 8455a96..7f6763f 100644
|
|
|
9ae3a8 |
--- a/hw/audio/ac97.c
|
|
|
9ae3a8 |
+++ b/hw/audio/ac97.c
|
|
|
9ae3a8 |
@@ -1323,9 +1323,9 @@ static const MemoryRegionOps ac97_io_nabm_ops = {
|
|
|
9ae3a8 |
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static void ac97_on_reset (void *opaque)
|
|
|
9ae3a8 |
+static void ac97_on_reset (DeviceState *dev)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- AC97LinkState *s = opaque;
|
|
|
9ae3a8 |
+ AC97LinkState *s = container_of(dev, AC97LinkState, dev.qdev);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
reset_bm_regs (s, &s->bm_regs[0]);
|
|
|
9ae3a8 |
reset_bm_regs (s, &s->bm_regs[1]);
|
|
|
9ae3a8 |
@@ -1382,9 +1382,8 @@ static int ac97_initfn (PCIDevice *dev)
|
|
|
9ae3a8 |
memory_region_init_io (&s->io_nabm, &ac97_io_nabm_ops, s, "ac97-nabm", 256);
|
|
|
9ae3a8 |
pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam);
|
|
|
9ae3a8 |
pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm);
|
|
|
9ae3a8 |
- qemu_register_reset (ac97_on_reset, s);
|
|
|
9ae3a8 |
AUD_register_card ("ac97", &s->card);
|
|
|
9ae3a8 |
- ac97_on_reset (s);
|
|
|
9ae3a8 |
+ ac97_on_reset (&s->dev.qdev);
|
|
|
9ae3a8 |
return 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -1422,6 +1421,7 @@ static void ac97_class_init (ObjectClass *klass, void *data)
|
|
|
9ae3a8 |
dc->desc = "Intel 82801AA AC97 Audio";
|
|
|
9ae3a8 |
dc->vmsd = &vmstate_ac97;
|
|
|
9ae3a8 |
dc->props = ac97_properties;
|
|
|
9ae3a8 |
+ dc->reset = ac97_on_reset;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const TypeInfo ac97_info = {
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|