|
 |
1bdc94 |
From 2b9789734ace2edd99aab3e76a559f29201e0d8d Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Date: Tue, 10 Jul 2018 23:06:14 +0200
|
|
|
1bdc94 |
Subject: [PATCH 31/89] ahci: trim signatures on raise/lower
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180710230616.11000-2-jsnow@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81295
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/3] ahci: trim signatures on raise/lower
|
|
|
1bdc94 |
Bugzilla: 1584914
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
These functions work on the AHCI device, not the individual
|
|
|
1bdc94 |
AHCI devices, so trim the AHCIDevice argument.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180531004323.4611-2-jsnow@redhat.com
|
|
|
1bdc94 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit dc5a43eda68fff32c7b0b43847332db325b094f3)
|
|
|
1bdc94 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/ide/ahci.c | 8 ++++----
|
|
|
1bdc94 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
|
|
|
1bdc94 |
index e22d7be..b7a6f68 100644
|
|
|
1bdc94 |
--- a/hw/ide/ahci.c
|
|
|
1bdc94 |
+++ b/hw/ide/ahci.c
|
|
|
1bdc94 |
@@ -131,7 +131,7 @@ static uint32_t ahci_port_read(AHCIState *s, int port, int offset)
|
|
|
1bdc94 |
return val;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-static void ahci_irq_raise(AHCIState *s, AHCIDevice *dev)
|
|
|
1bdc94 |
+static void ahci_irq_raise(AHCIState *s)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
DeviceState *dev_state = s->container;
|
|
|
1bdc94 |
PCIDevice *pci_dev = (PCIDevice *) object_dynamic_cast(OBJECT(dev_state),
|
|
|
1bdc94 |
@@ -146,7 +146,7 @@ static void ahci_irq_raise(AHCIState *s, AHCIDevice *dev)
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-static void ahci_irq_lower(AHCIState *s, AHCIDevice *dev)
|
|
|
1bdc94 |
+static void ahci_irq_lower(AHCIState *s)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
DeviceState *dev_state = s->container;
|
|
|
1bdc94 |
PCIDevice *pci_dev = (PCIDevice *) object_dynamic_cast(OBJECT(dev_state),
|
|
|
1bdc94 |
@@ -174,9 +174,9 @@ static void ahci_check_irq(AHCIState *s)
|
|
|
1bdc94 |
trace_ahci_check_irq(s, old_irq, s->control_regs.irqstatus);
|
|
|
1bdc94 |
if (s->control_regs.irqstatus &&
|
|
|
1bdc94 |
(s->control_regs.ghc & HOST_CTL_IRQ_EN)) {
|
|
|
1bdc94 |
- ahci_irq_raise(s, NULL);
|
|
|
1bdc94 |
+ ahci_irq_raise(s);
|
|
|
1bdc94 |
} else {
|
|
|
1bdc94 |
- ahci_irq_lower(s, NULL);
|
|
|
1bdc94 |
+ ahci_irq_lower(s);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|