Commit 9a7c2a59 authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Michael S. Tsirkin
Browse files

pci: Make errp the last parameter of pci_add_capability() 



Add Error argument for pci_add_capability() to leverage the errp
to pass info on errors. This way is helpful for its callers to
make a better error handling when moving to 'realize'.

Cc: pbonzini@redhat.com
Cc: rth@twiddle.net
Cc: ehabkost@redhat.com
Cc: mst@redhat.com
Cc: jasowang@redhat.com
Cc: marcel@redhat.com
Cc: alex.williamson@redhat.com
Cc: armbru@redhat.com
Signed-off-by: default avatarMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9a815774

hw/i386/amd_iommu.c

+17 −7
Original line number Diff line number Diff line
@@ -1158,13 +1158,23 @@ static void amdvi_realize(DeviceState *dev, Error **err) 
    x86_iommu->type = TYPE_AMD;

    qdev_set_parent_bus(DEVICE(&s->pci), &bus->qbus);

    object_property_set_bool(OBJECT(&s->pci), true, "realized", err);

    s->capab_offset = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0,

                                         AMDVI_CAPAB_SIZE);

    assert(s->capab_offset > 0);

    ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZE);

    assert(ret > 0);

    ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE);

    assert(ret > 0);

    ret = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0,

                                         AMDVI_CAPAB_SIZE, err);

    if (ret < 0) {

        return;

    }

    s->capab_offset = ret;



    ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0,

                             AMDVI_CAPAB_REG_SIZE, err);

    if (ret < 0) {

        return;

    }

    ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0,

                             AMDVI_CAPAB_REG_SIZE, err);

    if (ret < 0) {

        return;

    }



    /* set up MMIO */

    memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "amdvi-mmio",

hw/net/e1000e.c

+18 −12
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "e1000e_core.h"



#include "trace.h"

#include "qapi/error.h"



#define TYPE_E1000E "e1000e"

#define E1000E(obj) OBJECT_CHECK(E1000EState, (obj), TYPE_E1000E)
@@ -372,9 +373,15 @@ e1000e_gen_dsn(uint8_t *mac) 
static int

e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc)

{

    int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF);

    Error *local_err = NULL;

    int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset,

                                 PCI_PM_SIZEOF, &local_err);



    if (local_err) {

        error_report_err(local_err);

        return ret;

    }



    if (ret > 0) {

    pci_set_word(pdev->config + offset + PCI_PM_PMC,

                 PCI_PM_CAP_VER_1_1 |

                 pmc);
@@ -386,7 +393,6 @@ e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc) 


    pci_set_word(pdev->w1cmask + offset + PCI_PM_CTRL,

                 PCI_PM_CTRL_PME_STATUS);

    }



    return ret;

}

hw/net/eepro100.c

+14 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "sysemu/sysemu.h"

#include "sysemu/dma.h"

#include "qemu/bitops.h"

#include "qapi/error.h"



/* QEMU sends frames smaller than 60 bytes to ethernet nics.

 * Such frames are rejected by real nics and their emulations.
@@ -494,7 +495,7 @@ static void eepro100_fcp_interrupt(EEPRO100State * s) 
}

#endif



static void e100_pci_reset(EEPRO100State * s)

static void e100_pci_reset(EEPRO100State *s, Error **errp)

{

    E100PCIDeviceInfo *info = eepro100_get_class(s);

    uint32_t device = s->device;
@@ -570,8 +571,12 @@ static void e100_pci_reset(EEPRO100State * s) 
        /* Power Management Capabilities */

        int cfg_offset = 0xdc;

        int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM,

                                   cfg_offset, PCI_PM_SIZEOF);

        assert(r > 0);

                                   cfg_offset, PCI_PM_SIZEOF,

                                   errp);

        if (r < 0) {

            return;

        }



        pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21);

#if 0 /* TODO: replace dummy code for power management emulation. */

        /* TODO: Power Management Control / Status. */
@@ -1858,12 +1863,17 @@ static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) 
{

    EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);

    E100PCIDeviceInfo *info = eepro100_get_class(s);

    Error *local_err = NULL;



    TRACE(OTHER, logout("\n"));



    s->device = info->device;



    e100_pci_reset(s);

    e100_pci_reset(s, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    /* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM,

     * i82559 and later support 64 or 256 word EEPROM. */

hw/pci-bridge/i82801b11.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "qemu/osdep.h"

#include "hw/pci/pci.h"

#include "hw/i386/ich9.h"

#include "qapi/error.h"





/*****************************************************************************/

hw/pci/pci.c

+4 −6
Original line number Diff line number Diff line
@@ -2264,15 +2264,13 @@ static void pci_del_option_rom(PCIDevice *pdev) 
 * in pci config space

 */

int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,

                       uint8_t offset, uint8_t size)

                       uint8_t offset, uint8_t size,

                       Error **errp)

{

    int ret;

    Error *local_err = NULL;



    ret = pci_add_capability2(pdev, cap_id, offset, size, &local_err);

    if (ret < 0) {

        error_report_err(local_err);

    }

    ret = pci_add_capability2(pdev, cap_id, offset, size, errp);



    return ret;

}