[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function |
Date: |
Fri, 22 Jun 2012 19:33:22 -0500 |
From: Jan Kiszka <address@hidden>
Call msi_reset on device reset as still required by the core.
CC: Alexander Graf <address@hidden>
CC: address@hidden
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/ide/ich.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 560ae37..242254e 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -84,6 +84,14 @@ static const VMStateDescription vmstate_ahci = {
.unmigratable = 1,
};
+static void pci_ich9_reset(void *opaque)
+{
+ struct AHCIPCIState *d = opaque;
+
+ msi_reset(&d->card);
+ ahci_reset(opaque);
+}
+
static int pci_ich9_ahci_init(PCIDevice *dev)
{
struct AHCIPCIState *d;
@@ -102,7 +110,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
/* XXX Software should program this register */
d->card.config[0x90] = 1 << 6; /* Address Map Register - AHCI mode */
- qemu_register_reset(ahci_reset, d);
+ qemu_register_reset(pci_ich9_reset, d);
msi_init(dev, 0x50, 1, true, false);
d->ahci.irq = d->card.irq[0];
@@ -133,7 +141,7 @@ static int pci_ich9_uninit(PCIDevice *dev)
d = DO_UPCAST(struct AHCIPCIState, card, dev);
msi_uninit(dev);
- qemu_unregister_reset(ahci_reset, d);
+ qemu_unregister_reset(pci_ich9_reset, d);
ahci_uninit(&d->ahci);
return 0;
--
1.7.4.1
- [Qemu-devel] [PATCH stable-1.1 08/26] exec: fix TB invalidation after breakpoint insertion/deletion, (continued)
- [Qemu-devel] [PATCH stable-1.1 08/26] exec: fix TB invalidation after breakpoint insertion/deletion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 09/26] target-xtensa: fix CCOUNT for conditional branches, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 10/26] trace/simple.c: fix deprecated glib2 interface, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 11/26] configure: report missing libraries for virtfs, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 12/26] kvm/apic: correct short memset, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 13/26] kvm: i8254: Fix conversion of in-kernel to userspace state, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 14/26] qcow2: Silence false warning, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 15/26] monitor: Fix memory leak with readline completion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 16/26] configure: Fix build for some versions of glibc (9pfs), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 17/26] rtl8139: honor RxOverflow flag in can_receive method, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function,
Michael Roth <=
- [Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in pci_bridge_dev_initfn(), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 22/26] qcow2: fix endianness conversion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 23/26] Prevent disk data loss when closing qemu, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header update, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 25/26] fdc: fix implied seek while there is no media in drive, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 19/26] intel-hda: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 26/26] build: install qmp-commands.txt, Michael Roth, 2012/06/22
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Stefano Stabellini, 2012/06/25