diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:05:39 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:05:39 -0300 |
| commit | f43d541cb9ee6c40ae2af2ea37aa17f966264277 (patch) | |
| tree | d8e7f9497ac6aac8779db11252c8fc1b5beae739 /hw/pci.c | |
| parent | afc6763567e6f43b8421f4d8db13e9257c9566c6 (diff) | |
| parent | 1ecda02b24a13f501e747b8442934829d82698ae (diff) | |
Merge commit '1ecda02b24a13f501e747b8442934829d82698ae' into upstream-merge
* commit '1ecda02b24a13f501e747b8442934829d82698ae':
error: Replace qemu_error() by error_report()
error: Don't abuse qemu_error() for non-error in scsi_hot_add()
error: Don't abuse qemu_error() for non-error in qbus_find()
error: Don't abuse qemu_error() for non-error in qdev_device_help()
error: New error_printf() and error_vprintf()
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -670,12 +670,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, if (!bus->devices[devfn]) goto found; } - qemu_error("PCI: no devfn available for %s, all in use\n", name); + error_report("PCI: no devfn available for %s, all in use", name); return NULL; found: ; } else if (bus->devices[devfn]) { - qemu_error("PCI: devfn %d not available for %s, in use by %s\n", devfn, - name, bus->devices[devfn]->name); + error_report("PCI: devfn %d not available for %s, in use by %s", + devfn, name, bus->devices[devfn]->name); return NULL; } pci_dev->bus = bus; @@ -1621,8 +1621,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, bus = pci_get_bus_devfn(&devfn, devaddr); if (!bus) { - qemu_error("Invalid PCI device address %s for device %s\n", - devaddr, pci_nic_names[i]); + error_report("Invalid PCI device address %s for device %s", + devaddr, pci_nic_names[i]); return NULL; } @@ -1944,8 +1944,8 @@ static int pci_add_option_rom(PCIDevice *pdev) size = get_image_size(path); if (size < 0) { - qemu_error("%s: failed to find romfile \"%s\"\n", __FUNCTION__, - pdev->romfile); + error_report("%s: failed to find romfile \"%s\"", + __FUNCTION__, pdev->romfile); return -1; } if (size & (size - 1)) { |