Revision f055e96b hw/pci-bridge/pci_bridge_dev.c

b/hw/pci-bridge/pci_bridge_dev.c
38 38

  
39 39
static int pci_bridge_dev_initfn(PCIDevice *dev)
40 40
{
41
    PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
41
    PCIBridge *br = PCI_BRIDGE(dev);
42 42
    PCIBridgeDev *bridge_dev = DO_UPCAST(PCIBridgeDev, bridge, br);
43 43
    int err;
44 44

  
......
81 81

  
82 82
static void pci_bridge_dev_exitfn(PCIDevice *dev)
83 83
{
84
    PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
84
    PCIBridge *br = PCI_BRIDGE(dev);
85 85
    PCIBridgeDev *bridge_dev = DO_UPCAST(PCIBridgeDev, bridge, br);
86 86
    if (msi_present(dev)) {
87 87
        msi_uninit(dev);
......
120 120
static const VMStateDescription pci_bridge_dev_vmstate = {
121 121
    .name = "pci_bridge",
122 122
    .fields = (VMStateField[]) {
123
        VMSTATE_PCI_DEVICE(bridge.dev, PCIBridgeDev),
124
        SHPC_VMSTATE(bridge.dev.shpc, PCIBridgeDev),
123
        VMSTATE_PCI_DEVICE(bridge.parent_obj, PCIBridgeDev),
124
        SHPC_VMSTATE(bridge.parent_obj.shpc, PCIBridgeDev),
125 125
        VMSTATE_END_OF_LIST()
126 126
    }
127 127
};
......
146 146

  
147 147
static const TypeInfo pci_bridge_dev_info = {
148 148
    .name = "pci-bridge",
149
    .parent        = TYPE_PCI_DEVICE,
149
    .parent        = TYPE_PCI_BRIDGE,
150 150
    .instance_size = sizeof(PCIBridgeDev),
151 151
    .class_init = pci_bridge_dev_class_init,
152 152
};

Also available in: Unified diff