ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename pci_create_noinit() to pci_create() 

It's qdev_create() specialized for PCI, so name it accordingly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-09-25 03:53:53 +02:00 committed by Anthony Liguori
parent 3312958dba
commit 499cf1027f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ide/pci.c
View File

@ -443,7 +443,7 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table,
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_create_noinit(bus, -1, "CMD646 IDE"); dev = pci_create(bus, -1, "CMD646 IDE");
qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled); qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled);
qdev_init(&dev->qdev); qdev_init(&dev->qdev);

4
hw/pci-hotplug.c
View File

@ -151,14 +151,14 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
switch (type) { switch (type) {
case IF_SCSI: case IF_SCSI:
dev = pci_create_noinit(bus, devfn, "lsi53c895a"); dev = pci_create(bus, devfn, "lsi53c895a");
break; break;
case IF_VIRTIO: case IF_VIRTIO:
if (!dinfo) { if (!dinfo) {
monitor_printf(mon, "virtio requires a backing file/device.\n"); monitor_printf(mon, "virtio requires a backing file/device.\n");
return NULL; return NULL;
} }
dev = pci_create_noinit(bus, devfn, "virtio-blk-pci"); dev = pci_create(bus, devfn, "virtio-blk-pci");
qdev_prop_set_drive(&dev->qdev, "drive", dinfo); qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
break; break;
default: default:

8
hw/pci.c
View File

@ -866,7 +866,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
return NULL; return NULL;
} }
pci_dev = pci_create_noinit(bus, devfn, pci_nic_names[i]); pci_dev = pci_create(bus, devfn, pci_nic_names[i]);
dev = &pci_dev->qdev; dev = &pci_dev->qdev;
if (nd->id) if (nd->id)
dev->id = qemu_strdup(nd->id); dev->id = qemu_strdup(nd->id);
@ -954,7 +954,7 @@ PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,
PCIDevice *dev; PCIDevice *dev;
PCIBridge *s; PCIBridge *s;
dev = pci_create_noinit(bus, devfn, "pci-bridge"); dev = pci_create(bus, devfn, "pci-bridge");
qdev_prop_set_uint32(&dev->qdev, "vendorid", vid); qdev_prop_set_uint32(&dev->qdev, "vendorid", vid);
qdev_prop_set_uint32(&dev->qdev, "deviceid", did); qdev_prop_set_uint32(&dev->qdev, "deviceid", did);
qdev_init(&dev->qdev); qdev_init(&dev->qdev);
@ -1009,7 +1009,7 @@ void pci_qdev_register_many(PCIDeviceInfo *info)
} }
} }
PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name) PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name)
{ {
DeviceState *dev; DeviceState *dev;
@ -1020,7 +1020,7 @@ PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name)
PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name)
{ {
PCIDevice *dev = pci_create_noinit(bus, devfn, name); PCIDevice *dev = pci_create(bus, devfn, name);
qdev_init(&dev->qdev); qdev_init(&dev->qdev);
return dev; return dev;
} }

2
hw/pci.h
View File

@ -339,7 +339,7 @@ typedef struct {
void pci_qdev_register(PCIDeviceInfo *info); void pci_qdev_register(PCIDeviceInfo *info);
void pci_qdev_register_many(PCIDeviceInfo *info); void pci_qdev_register_many(PCIDeviceInfo *info);
PCIDevice *pci_create_noinit(PCIBus *bus, int devfn, const char *name); PCIDevice *pci_create(PCIBus *bus, int devfn, const char *name);
PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name);
/* lsi53c895a.c */ /* lsi53c895a.c */

2
hw/vga-pci.c
View File

@ -125,7 +125,7 @@ int pci_vga_init(PCIBus *bus,
{ {
PCIDevice *dev; PCIDevice *dev;
dev = pci_create_noinit(bus, -1, "VGA"); dev = pci_create(bus, -1, "VGA");
qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset); qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset);
qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_offset); qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_offset);
qdev_init(&dev->qdev); qdev_init(&dev->qdev);