Revision 499cf102
| b/hw/ide/pci.c | ||
|---|---|---|
| 443 | 443 |
{
|
| 444 | 444 |
PCIDevice *dev; |
| 445 | 445 |
|
| 446 |
dev = pci_create_noinit(bus, -1, "CMD646 IDE");
|
|
| 446 |
dev = pci_create(bus, -1, "CMD646 IDE"); |
|
| 447 | 447 |
qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled); |
| 448 | 448 |
qdev_init(&dev->qdev); |
| 449 | 449 |
|
| b/hw/pci-hotplug.c | ||
|---|---|---|
| 151 | 151 |
|
| 152 | 152 |
switch (type) {
|
| 153 | 153 |
case IF_SCSI: |
| 154 |
dev = pci_create_noinit(bus, devfn, "lsi53c895a");
|
|
| 154 |
dev = pci_create(bus, devfn, "lsi53c895a"); |
|
| 155 | 155 |
break; |
| 156 | 156 |
case IF_VIRTIO: |
| 157 | 157 |
if (!dinfo) {
|
| 158 | 158 |
monitor_printf(mon, "virtio requires a backing file/device.\n"); |
| 159 | 159 |
return NULL; |
| 160 | 160 |
} |
| 161 |
dev = pci_create_noinit(bus, devfn, "virtio-blk-pci");
|
|
| 161 |
dev = pci_create(bus, devfn, "virtio-blk-pci"); |
|
| 162 | 162 |
qdev_prop_set_drive(&dev->qdev, "drive", dinfo); |
| 163 | 163 |
break; |
| 164 | 164 |
default: |
| b/hw/pci.c | ||
|---|---|---|
| 866 | 866 |
return NULL; |
| 867 | 867 |
} |
| 868 | 868 |
|
| 869 |
pci_dev = pci_create_noinit(bus, devfn, pci_nic_names[i]);
|
|
| 869 |
pci_dev = pci_create(bus, devfn, pci_nic_names[i]); |
|
| 870 | 870 |
dev = &pci_dev->qdev; |
| 871 | 871 |
if (nd->id) |
| 872 | 872 |
dev->id = qemu_strdup(nd->id); |
| ... | ... | |
| 954 | 954 |
PCIDevice *dev; |
| 955 | 955 |
PCIBridge *s; |
| 956 | 956 |
|
| 957 |
dev = pci_create_noinit(bus, devfn, "pci-bridge");
|
|
| 957 |
dev = pci_create(bus, devfn, "pci-bridge"); |
|
| 958 | 958 |
qdev_prop_set_uint32(&dev->qdev, "vendorid", vid); |
| 959 | 959 |
qdev_prop_set_uint32(&dev->qdev, "deviceid", did); |
| 960 | 960 |
qdev_init(&dev->qdev); |
| ... | ... | |
| 1009 | 1009 |
} |
| 1010 | 1010 |
} |
| 1011 | 1011 |
|
| 1012 |
PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name)
|
|
| 1012 |
PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name) |
|
| 1013 | 1013 |
{
|
| 1014 | 1014 |
DeviceState *dev; |
| 1015 | 1015 |
|
| ... | ... | |
| 1020 | 1020 |
|
| 1021 | 1021 |
PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) |
| 1022 | 1022 |
{
|
| 1023 |
PCIDevice *dev = pci_create_noinit(bus, devfn, name);
|
|
| 1023 |
PCIDevice *dev = pci_create(bus, devfn, name); |
|
| 1024 | 1024 |
qdev_init(&dev->qdev); |
| 1025 | 1025 |
return dev; |
| 1026 | 1026 |
} |
| b/hw/pci.h | ||
|---|---|---|
| 339 | 339 |
void pci_qdev_register(PCIDeviceInfo *info); |
| 340 | 340 |
void pci_qdev_register_many(PCIDeviceInfo *info); |
| 341 | 341 |
|
| 342 |
PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name);
|
|
| 342 |
PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name); |
|
| 343 | 343 |
PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); |
| 344 | 344 |
|
| 345 | 345 |
/* lsi53c895a.c */ |
| b/hw/vga-pci.c | ||
|---|---|---|
| 125 | 125 |
{
|
| 126 | 126 |
PCIDevice *dev; |
| 127 | 127 |
|
| 128 |
dev = pci_create_noinit(bus, -1, "VGA");
|
|
| 128 |
dev = pci_create(bus, -1, "VGA"); |
|
| 129 | 129 |
qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset); |
| 130 | 130 |
qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_offset); |
| 131 | 131 |
qdev_init(&dev->qdev); |
Also available in: Unified diff