[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 09/11] pseries: savevm support for PCI host bridge
From: |
Anthony Liguori |
Subject: |
[Qemu-ppc] [PATCH v2 09/11] pseries: savevm support for PCI host bridge |
Date: |
Thu, 18 Jul 2013 14:33:02 -0500 |
From: David Gibson <address@hidden>
This adds the necessary support for saving the state of the PAPR virtual
PCI host bridge (or host bridges).
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
---
hw/ppc/spapr_pci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++
include/hw/pci-host/spapr.h | 6 +++---
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index dd9e74e..560d375c 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -699,6 +699,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)
{
@@ -717,6 +765,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 = {
diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
index 1e23dbf..93f9511 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -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;
--
1.8.0
- [Qemu-ppc] [PATCH v2 08/11] pseries: savevm support for pseries machine, (continued)
- [Qemu-ppc] [PATCH v2 08/11] pseries: savevm support for pseries machine, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 02/11] pseries: savevm support for VIO devices, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 06/11] pseries: rework PAPR virtual SCSI, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 03/11] pseries: savevm support for PAPR VIO logical lan, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 07/11] pseries: savevm support for PAPR virtual SCSI, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 05/11] spapr-tce: make sPAPRTCETable a proper device, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 04/11] pseries: savevm support for PAPR VIO logical tty, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 01/11] target-ppc: Convert ppc cpu savevm to VMStateDescription, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 09/11] pseries: savevm support for PCI host bridge,
Anthony Liguori <=
- [Qemu-ppc] [PATCH v2 10/11] pseries: savevm support with KVM, Anthony Liguori, 2013/07/18
- [Qemu-ppc] [PATCH v2 11/11] xics: rename types to be sane and follow coding style, Anthony Liguori, 2013/07/18
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v2 00/11] pseries: migration and QOM support, Anthony Liguori, 2013/07/23
- Re: [Qemu-ppc] [PATCH v2 00/11] pseries: migration and QOM support, Anthony Liguori, 2013/07/29