On Wed, Dec 21, 2016 at 04:21:31PM +0800, Cao jin wrote: > From: Dou Liyang <douly.f...@cn.fujitsu.com> > > Now, AER capa version is fixed to v2, if assigned device isn't v2, > then this value will be inconsistent between guest and host > > Signed-off-by: Dou Liyang <douly.f...@cn.fujitsu.com> > Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com> > Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
I assume this is good for AER work so I'll merge this, but these patches don't do anything by themselves in the future pls make this explicit in commit log. > --- > hw/net/e1000e.c | 3 ++- > hw/pci-bridge/ioh3420.c | 3 ++- > hw/pci-bridge/xio3130_downstream.c | 3 ++- > hw/pci-bridge/xio3130_upstream.c | 3 ++- > hw/pci/pcie_aer.c | 6 +++--- > include/hw/pci/pcie_aer.h | 4 ++-- > 6 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c > index 89f96eb4a076..77a4b3e5bf9d 100644 > --- a/hw/net/e1000e.c > +++ b/hw/net/e1000e.c > @@ -472,7 +472,8 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error > **errp) > hw_error("Failed to initialize PM capability"); > } > > - if (pcie_aer_init(pci_dev, e1000e_aer_offset, PCI_ERR_SIZEOF, NULL) < 0) > { > + if (pcie_aer_init(pci_dev, PCI_ERR_VER, e1000e_aer_offset, > + PCI_ERR_SIZEOF, NULL) < 0) { > hw_error("Failed to initialize AER capability"); > } > > diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c > index 04180af79471..84b7946c3136 100644 > --- a/hw/pci-bridge/ioh3420.c > +++ b/hw/pci-bridge/ioh3420.c > @@ -135,7 +135,8 @@ static int ioh3420_initfn(PCIDevice *d) > goto err_pcie_cap; > } > > - rc = pcie_aer_init(d, IOH_EP_AER_OFFSET, PCI_ERR_SIZEOF, &err); > + rc = pcie_aer_init(d, PCI_ERR_VER, IOH_EP_AER_OFFSET, > + PCI_ERR_SIZEOF, &err); > if (rc < 0) { > error_report_err(err); > goto err; > diff --git a/hw/pci-bridge/xio3130_downstream.c > b/hw/pci-bridge/xio3130_downstream.c > index 571334185b42..04b8e5b8479e 100644 > --- a/hw/pci-bridge/xio3130_downstream.c > +++ b/hw/pci-bridge/xio3130_downstream.c > @@ -97,7 +97,8 @@ static int xio3130_downstream_initfn(PCIDevice *d) > goto err_pcie_cap; > } > > - rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF, &err); > + rc = pcie_aer_init(d, PCI_ERR_VER, XIO3130_AER_OFFSET, > + PCI_ERR_SIZEOF, &err); > if (rc < 0) { > error_report_err(err); > goto err; > diff --git a/hw/pci-bridge/xio3130_upstream.c > b/hw/pci-bridge/xio3130_upstream.c > index 94c16910069e..d1f59c883477 100644 > --- a/hw/pci-bridge/xio3130_upstream.c > +++ b/hw/pci-bridge/xio3130_upstream.c > @@ -85,7 +85,8 @@ static int xio3130_upstream_initfn(PCIDevice *d) > pcie_cap_flr_init(d); > pcie_cap_deverr_init(d); > > - rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF, &err); > + rc = pcie_aer_init(d, PCI_ERR_VER, XIO3130_AER_OFFSET, > + PCI_ERR_SIZEOF, &err); > if (rc < 0) { > error_report_err(err); > goto err; > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index 2a4bd5aef639..daf1f65427c2 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -97,10 +97,10 @@ static void aer_log_clear_all_err(PCIEAERLog *aer_log) > aer_log->log_num = 0; > } > > -int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size, > - Error **errp) > +int pcie_aer_init(PCIDevice *dev, uint8_t cap_ver, uint16_t offset, > + uint16_t size, Error **errp) > { > - pcie_add_capability(dev, PCI_EXT_CAP_ID_ERR, PCI_ERR_VER, > + pcie_add_capability(dev, PCI_EXT_CAP_ID_ERR, cap_ver, > offset, size); > dev->exp.aer_cap = offset; > > diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h > index 5891b6816e85..526802bd312b 100644 > --- a/include/hw/pci/pcie_aer.h > +++ b/include/hw/pci/pcie_aer.h > @@ -86,8 +86,8 @@ struct PCIEAERErr { > > extern const VMStateDescription vmstate_pcie_aer_log; > > -int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size, > - Error **errp); > +int pcie_aer_init(PCIDevice *dev, uint8_t cap_ver, uint16_t offset, > + uint16_t size, Error **errp); > void pcie_aer_exit(PCIDevice *dev); > void pcie_aer_write_config(PCIDevice *dev, > uint32_t addr, uint32_t val, int len); > -- > 2.1.0 > >