[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] Rename pci_create_noinit() to pci_create()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 6/6] Rename pci_create_noinit() to pci_create() |
Date: |
Fri, 25 Sep 2009 03:53:53 +0200 |
It's qdev_create() specialized for PCI, so name it accordingly.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/pci.c | 2 +-
hw/pci-hotplug.c | 4 ++--
hw/pci.c | 6 +++---
hw/pci.h | 2 +-
hw/vga-pci.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 89ecd44..58130d1 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -443,7 +443,7 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table,
{
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_init(&dev->qdev);
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index d6093ba..dfd2cf3 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -144,14 +144,14 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
switch (type) {
case IF_SCSI:
- dev = pci_create_noinit(bus, devfn, "lsi53c895a");
+ dev = pci_create(bus, devfn, "lsi53c895a");
break;
case IF_VIRTIO:
if (!dinfo) {
monitor_printf(mon, "virtio requires a backing file/device.\n");
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);
break;
default:
diff --git a/hw/pci.c b/hw/pci.c
index ec0fc7c..b3ba575 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -810,7 +810,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char
*default_model,
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;
if (nd->id)
dev->id = qemu_strdup(nd->id);
@@ -925,7 +925,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;
@@ -936,7 +936,7 @@ PCIDevice *pci_create_noinit(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);
return dev;
}
diff --git a/hw/pci.h b/hw/pci.h
index 689461f..7f034ff 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -336,7 +336,7 @@ typedef struct {
void pci_qdev_register(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);
/* lsi53c895a.c */
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 129ff48..314ef03 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -137,7 +137,7 @@ int pci_vga_init(PCIBus *bus,
{
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-size", vga_bios_offset);
qdev_init(&dev->qdev);
--
1.6.2.5
- [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 2/6] Fix pci_add storage not to exit on bad first argument, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 1/6] Fix pci_vga_init() not to ignore bus argument, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 6/6] Rename pci_create_noinit() to pci_create(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 4/6] Fix pci_add nic not to exit on bad model, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 3/6] Make it obvious that pci_nic_init() can't fail, Markus Armbruster, 2009/09/24
- [Qemu-devel] [PATCH 5/6] pci_create() is now unused, remove it, Markus Armbruster, 2009/09/24
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Gerd Hoffmann, 2009/09/25
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Luiz Capitulino, 2009/09/25
- Re: [Qemu-devel] [PATCH 0/6] Fix pci_add not to exit on error & other fixes, Mark McLoughlin, 2009/09/28