diff options
author | Markus Armbruster <armbru@redhat.com> | 2010-02-18 17:25:24 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2010-03-16 16:58:32 +0100 |
commit | 1ecda02b24a13f501e747b8442934829d82698ae (patch) | |
tree | 8989913831ca3e48220b57f9104978015e39c5cb /hw/pci.c | |
parent | 6fdb03d58c614e0097d80ed130c19dcc393f7421 (diff) |
error: Replace qemu_error() by error_report()
error_report() terminates the message with a newline. Strip it it
from its arguments.
This fixes a few error messages lacking a newline:
net_handle_fd_param()'s "No file descriptor named %s found", and
tap_open()'s "vnet_hdr=1 requested, but no kernel support for
IFF_VNET_HDR available" (all three versions).
There's one place that passes arguments without newlines
intentionally: load_vmstate(). Fix it up.
Diffstat (limited to 'hw/pci.c')
-rw-r--r-- | hw/pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -589,12 +589,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; @@ -1476,8 +1476,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; } @@ -1768,8 +1768,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)) { |