yes
> DEFINE_PROP_BIT("aer", VirtIOPCIProxy, flags,
> VIRTIO_PCI_FLAG_AER_BIT, *false*),
>
On Mon, Oct 5, 2020 at 1:08 PM Michael S. Tsirkin <m...@redhat.com> wrote:
> On Mon, Oct 05, 2020 at 12:01:40PM +0300, and...@daynix.com wrote:
> > From: Andrew <and...@daynix.com>
> >
> > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1857668
> > Added AER capability for virtio-pci devices.
> > Also added property for devices, by default AER is enabled.
>
>
> Looking at code it's disabled by default, isn't it?
>
> >
> > Signed-off-by: Andrew Melnychenko <and...@daynix.com>
> > ---
> > hw/virtio/virtio-pci.c | 16 ++++++++++++++++
> > hw/virtio/virtio-pci.h | 4 ++++
> > 2 files changed, 20 insertions(+)
> >
> > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> > index ae60c1e249..e0a7936f9c 100644
> > --- a/hw/virtio/virtio-pci.c
> > +++ b/hw/virtio/virtio-pci.c
> > @@ -1807,6 +1807,12 @@ static void virtio_pci_realize(PCIDevice
> *pci_dev, Error **errp)
> > */
> > pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3);
> >
> > + if (proxy->flags & VIRTIO_PCI_FLAG_AER) {
> > + pcie_aer_init(pci_dev, PCI_ERR_VER, last_pcie_cap_offset,
> > + PCI_ERR_SIZEOF, NULL);
> > + last_pcie_cap_offset += PCI_ERR_SIZEOF;
> > + }
> > +
> > if (proxy->flags & VIRTIO_PCI_FLAG_INIT_DEVERR) {
> > /* Init error enabling flags */
> > pcie_cap_deverr_init(pci_dev);
> > @@ -1848,7 +1854,15 @@ static void virtio_pci_realize(PCIDevice
> *pci_dev, Error **errp)
> >
> > static void virtio_pci_exit(PCIDevice *pci_dev)
> > {
> > + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev);
> > + bool pcie_port = pci_bus_is_express(pci_get_bus(pci_dev)) &&
> > + !pci_bus_is_root(pci_get_bus(pci_dev));
> > +
> > msix_uninit_exclusive_bar(pci_dev);
> > + if (proxy->flags & VIRTIO_PCI_FLAG_AER && pcie_port &&
> > + pci_is_express(pci_dev)) {
> > + pcie_aer_exit(pci_dev);
> > + }
> > }
> >
> > static void virtio_pci_reset(DeviceState *qdev)
> > @@ -1901,6 +1915,8 @@ static Property virtio_pci_properties[] = {
> > VIRTIO_PCI_FLAG_INIT_PM_BIT, true),
> > DEFINE_PROP_BIT("x-pcie-flr-init", VirtIOPCIProxy, flags,
> > VIRTIO_PCI_FLAG_INIT_FLR_BIT, true),
> > + DEFINE_PROP_BIT("aer", VirtIOPCIProxy, flags,
> > + VIRTIO_PCI_FLAG_AER_BIT, false),
> > DEFINE_PROP_END_OF_LIST(),
> > };
> >
> > diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
> > index 91096f0291..3986b4f0e3 100644
> > --- a/hw/virtio/virtio-pci.h
> > +++ b/hw/virtio/virtio-pci.h
> > @@ -45,6 +45,7 @@ enum {
> > VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT,
> > VIRTIO_PCI_FLAG_INIT_PM_BIT,
> > VIRTIO_PCI_FLAG_INIT_FLR_BIT,
> > + VIRTIO_PCI_FLAG_AER_BIT,
> > };
> >
> > /* Need to activate work-arounds for buggy guests at vmstate load. */
> > @@ -84,6 +85,9 @@ enum {
> > /* Init Function Level Reset capability */
> > #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT)
> >
> > +/* Advanced Error Reporting capability */
> > +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT)
> > +
> > typedef struct {
> > MSIMessage msg;
> > int virq;
> > --
> > 2.28.0
>
>
