|
 |
ddf19c |
From f98a1fdad0aa53337925ac46b73a3e6ad36f6295 Mon Sep 17 00:00:00 2001
|
|
|
ddf19c |
From: Julia Suvorova <jusual@redhat.com>
|
|
|
ddf19c |
Date: Mon, 4 May 2020 21:25:05 +0100
|
|
|
ddf19c |
Subject: [PATCH 2/9] hw/pci/pcie: Replace PCI_DEVICE() casts with existing
|
|
|
ddf19c |
variable
|
|
|
ddf19c |
|
|
|
ddf19c |
RH-Author: Julia Suvorova <jusual@redhat.com>
|
|
|
ddf19c |
Message-id: <20200504212505.15977-3-jusual@redhat.com>
|
|
|
ddf19c |
Patchwork-id: 96259
|
|
|
ddf19c |
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 2/2] hw/pci/pcie: Replace PCI_DEVICE() casts with existing variable
|
|
|
ddf19c |
Bugzilla: 1820531
|
|
|
ddf19c |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
ddf19c |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
ddf19c |
|
|
|
ddf19c |
A little cleanup is possible because of hotplug_pdev introduction.
|
|
|
ddf19c |
|
|
|
ddf19c |
Signed-off-by: Julia Suvorova <jusual@redhat.com>
|
|
|
ddf19c |
Message-Id: <20200427182440.92433-3-jusual@redhat.com>
|
|
|
ddf19c |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ddf19c |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ddf19c |
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
|
|
|
ddf19c |
(cherry picked from commit 6a1e073378353eb6ac0565e0dc649b3db76ed5dc)
|
|
|
ddf19c |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ddf19c |
---
|
|
|
ddf19c |
hw/pci/pcie.c | 6 +++---
|
|
|
ddf19c |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
ddf19c |
|
|
|
ddf19c |
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
|
|
|
ddf19c |
index 6b48d04..abc99b6 100644
|
|
|
ddf19c |
--- a/hw/pci/pcie.c
|
|
|
ddf19c |
+++ b/hw/pci/pcie.c
|
|
|
ddf19c |
@@ -449,7 +449,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
ddf19c |
pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA,
|
|
|
ddf19c |
PCI_EXP_LNKSTA_DLLLA);
|
|
|
ddf19c |
}
|
|
|
ddf19c |
- pcie_cap_slot_event(PCI_DEVICE(hotplug_dev),
|
|
|
ddf19c |
+ pcie_cap_slot_event(hotplug_pdev,
|
|
|
ddf19c |
PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP);
|
|
|
ddf19c |
}
|
|
|
ddf19c |
}
|
|
|
ddf19c |
@@ -490,7 +490,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
|
ddf19c |
return;
|
|
|
ddf19c |
}
|
|
|
ddf19c |
|
|
|
ddf19c |
- pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &local_err);
|
|
|
ddf19c |
+ pcie_cap_slot_plug_common(hotplug_pdev, dev, &local_err);
|
|
|
ddf19c |
if (local_err) {
|
|
|
ddf19c |
error_propagate(errp, local_err);
|
|
|
ddf19c |
return;
|
|
|
ddf19c |
@@ -509,7 +509,7 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
|
ddf19c |
return;
|
|
|
ddf19c |
}
|
|
|
ddf19c |
|
|
|
ddf19c |
- pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev));
|
|
|
ddf19c |
+ pcie_cap_slot_push_attention_button(hotplug_pdev);
|
|
|
ddf19c |
}
|
|
|
ddf19c |
|
|
|
ddf19c |
/* pci express slot for pci express root/downstream port
|
|
|
ddf19c |
--
|
|
|
ddf19c |
1.8.3.1
|
|
|
ddf19c |
|