aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2011-11-16 13:46:22 -0700
committerAndreas Färber <afaerber@suse.de>2012-10-09 19:03:59 +0200
commitb2be0429795b18c018610d48142e797cbc31be0d (patch)
tree9adc60859103534c6c2469aef3dc2d0ab666af27
parentb795dcb53c7a928c99ca6d0aede8183df0d63c5f (diff)
downloadqemu-kvm-stable-0.15.tar.gz
pci-assign: Remove bogus PCIe lnkcap wmask settingstable-0.15
All the fields of lnkcap are read-only and this is setting it with mask values from LNKCTL. Just below it, we indicate link control is read only, so this appears to be a stray chunk left in from development. Trivial comment fix while we're here. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 0cbb68b1ce40e9b7e0b8cea5fd849f5c6bd09aee) Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/device-assignment.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 43029a4cf16..390814469e1 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1481,7 +1481,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
pci_set_long(pci_dev->config + pos + PCI_EXP_DEVCAP, devcap);
/* device control: clear all error reporting enable bits, leaving
- * leaving only a few host values. Note, these are
+ * only a few host values. Note, these are
* all writable, but not passed to hw.
*/
devctl = pci_get_word(pci_dev->config + pos + PCI_EXP_DEVCTL);
@@ -1500,10 +1500,6 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
PCI_EXP_LNKCAP_ASPMS | PCI_EXP_LNKCAP_L0SEL |
PCI_EXP_LNKCAP_L1EL);
pci_set_long(pci_dev->config + pos + PCI_EXP_LNKCAP, lnkcap);
- pci_set_word(pci_dev->wmask + pos + PCI_EXP_LNKCAP,
- PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_RCB |
- PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES |
- PCI_EXP_LNKCTL_CLKREQ_EN | PCI_EXP_LNKCTL_HAWD);
/* Link control, pass existing read-only copy. Should be writable? */