Commit 1112cf94 authored by David Gibson's avatar David Gibson Committed by Anthony Liguori
Browse files

pseries: savevm support for PCI host bridge 



This adds the necessary support for saving the state of the PAPR virtual
PCI host bridge (or host bridges).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374175984-8930-10-git-send-email-aliguori@us.ibm.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 4be21d56

hw/ppc/spapr_pci.c

+49 −0
Original line number Diff line number Diff line
@@ -662,6 +662,54 @@ static Property spapr_phb_properties[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static const VMStateDescription vmstate_spapr_pci_lsi = {

    .name = "spapr_pci/lsi",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField []) {

        VMSTATE_UINT32_EQUAL(irq, struct spapr_pci_lsi),



        VMSTATE_END_OF_LIST()

    },

};



static const VMStateDescription vmstate_spapr_pci_msi = {

    .name = "spapr_pci/lsi",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField []) {

        VMSTATE_UINT32(config_addr, struct spapr_pci_msi),

        VMSTATE_UINT32(irq, struct spapr_pci_msi),

        VMSTATE_UINT32(nvec, struct spapr_pci_msi),



        VMSTATE_END_OF_LIST()

    },

};



static const VMStateDescription vmstate_spapr_pci = {

    .name = "spapr_pci",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField []) {

        VMSTATE_UINT64_EQUAL(buid, sPAPRPHBState),

        VMSTATE_UINT32_EQUAL(dma_liobn, sPAPRPHBState),

        VMSTATE_UINT64_EQUAL(mem_win_addr, sPAPRPHBState),

        VMSTATE_UINT64_EQUAL(mem_win_size, sPAPRPHBState),

        VMSTATE_UINT64_EQUAL(io_win_addr, sPAPRPHBState),

        VMSTATE_UINT64_EQUAL(io_win_size, sPAPRPHBState),

        VMSTATE_UINT64_EQUAL(msi_win_addr, sPAPRPHBState),

        VMSTATE_STRUCT_ARRAY(lsi_table, sPAPRPHBState, PCI_NUM_PINS, 0,

                             vmstate_spapr_pci_lsi, struct spapr_pci_lsi),

        VMSTATE_STRUCT_ARRAY(msi_table, sPAPRPHBState, SPAPR_MSIX_MAX_DEVS, 0,

                             vmstate_spapr_pci_msi, struct spapr_pci_msi),



        VMSTATE_END_OF_LIST()

    },

};



static const char *spapr_phb_root_bus_path(PCIHostState *host_bridge,

                                           PCIBus *rootbus)

{
@@ -680,6 +728,7 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) 
    sdc->init = spapr_phb_init;

    dc->props = spapr_phb_properties;

    dc->reset = spapr_phb_reset;

    dc->vmsd = &vmstate_spapr_pci;

}



static const TypeInfo spapr_phb_info = {

include/hw/pci-host/spapr.h

+3 −3
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ typedef struct sPAPRPHBState { 
    sPAPRTCETable *tcet;

    AddressSpace iommu_as;



    struct {

    struct spapr_pci_lsi {

        uint32_t irq;

    } lsi_table[PCI_NUM_PINS];



    struct {

    struct spapr_pci_msi {

        uint32_t config_addr;

        uint32_t irq;

        int nvec;

        uint32_t nvec;

    } msi_table[SPAPR_MSIX_MAX_DEVS];



    QLIST_ENTRY(sPAPRPHBState) list;