rtoss - Diff between revs 77 and 79

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 77 Rev 79
Line 77... Line 77...
77     .version_id = 1, 77     .version_id = 1,
78     .minimum_version_id = 1, 78     .minimum_version_id = 1,
79     .minimum_version_id_old = 1, 79     .minimum_version_id_old = 1,
80     .fields      = (VMStateField []) { 80     .fields      = (VMStateField []) {
81         VMSTATE_INT32_EQUAL(nirq, PCIBus), 81         VMSTATE_INT32_EQUAL(nirq, PCIBus),
82         VMSTATE_INT32_VARRAY(irq_count, PCIBus, nirq), -  
-   82         VMSTATE_VARRAY_INT32(irq_count, PCIBus, nirq, 0, vmstate_info_int32, int32_t),
83         VMSTATE_END_OF_LIST() 83         VMSTATE_END_OF_LIST()
84     } 84     }
85 }; 85 };
86 86
87 static inline int pci_bar(int reg) 87 static inline int pci_bar(int reg)
Line 857... Line 857...
857 857
858     pci_dev = pci_create(bus, devfn, pci_nic_names[i]); 858     pci_dev = pci_create(bus, devfn, pci_nic_names[i]);
859     dev = &pci_dev->qdev; 859     dev = &pci_dev->qdev;
860     if (nd->name) 860     if (nd->name)
861         dev->id = qemu_strdup(nd->name); 861         dev->id = qemu_strdup(nd->name);
862     dev->nd = nd; -  
-   862     qdev_set_nic_properties(dev, nd);
863     if (qdev_init(dev) < 0) 863     if (qdev_init(dev) < 0)
864         return NULL; 864         return NULL;
865     nd->private = dev; -  
866     return pci_dev; 865     return pci_dev;
867 } 866 }
868 867
869 PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, 868 PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
870                                const char *default_devaddr) 869                                const char *default_devaddr)