Message ID | 1444837878-11602-5-git-send-email-knut.omang@oracle.com |
---|---|
State | New |
Headers | show |
On 10/14/2015 06:51 PM, Knut Omang wrote: > - Fix comment typo in pcie_cap_slot_write_config > - Simplify code in pcie_cap_slot_hot_unplug_request_cb. > > Signed-off-by: Knut Omang <knut.omang@oracle.com> > --- > hw/pci/pcie.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index 774b9ed..ba49c0f 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -265,10 +265,11 @@ void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > uint8_t *exp_cap; > + PCIDevice *pdev = PCI_DEVICE(hotplug_dev); > > - pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp); > + pcie_cap_slot_hotplug_common(pdev, dev, &exp_cap, errp); > > - pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev)); > + pcie_cap_slot_push_attention_button(pdev); > } > > /* pci express slot for pci express root/downstream port > @@ -408,7 +409,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, > } > > /* > - * If the slot is polulated, power indicator is off and power > + * If the slot is populated, power indicator is off and power > * controller is off, it is safe to detach the devices. > */ > if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 774b9ed..ba49c0f 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -265,10 +265,11 @@ void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { uint8_t *exp_cap; + PCIDevice *pdev = PCI_DEVICE(hotplug_dev); - pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp); + pcie_cap_slot_hotplug_common(pdev, dev, &exp_cap, errp); - pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev)); + pcie_cap_slot_push_attention_button(pdev); } /* pci express slot for pci express root/downstream port @@ -408,7 +409,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, } /* - * If the slot is polulated, power indicator is off and power + * If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. */ if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) &&
- Fix comment typo in pcie_cap_slot_write_config - Simplify code in pcie_cap_slot_hot_unplug_request_cb. Signed-off-by: Knut Omang <knut.omang@oracle.com> --- hw/pci/pcie.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)