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

Clarify error message when a PCI slot is already in use (v2) 

When mistakenly configuring two devices in the same PCI slot,
QEMU gives a not entirely obvious message about a 'devfn' being
in use:

$ qemu -device rtl8139 -device virtio-balloon-pci,bus=pci.0,addr=0x3
qemu-kvm: -device virtio-balloon-pci,bus=pci.0,addr=0x3: PCI: devfn 24 not available for virtio-balloon-pci, in use by rtl8139

The user does not configure 'devfn' numbers, they use slot+function.
Thus the error messages should be reported back to the user with that
same terminology rather than the internal QEMU terminology. This
patch makes it report:

$ qemu -device rtl8139 -device virtio-balloon-pci,bus=pci.0,addr=0x3
qemu: -device virtio-balloon-pci,bus=pci.0,addr=0x3.7: PCI: slot 3 function 0 not available for virtio-balloon-pci, in use by rtl8139

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Daniel P. Berrange 2010-06-08 15:24:25 +01:00 committed by Anthony Liguori
parent c20fd87225
commit 3709c1b7cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/pci.c
View File

@ -609,12 +609,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
if (!bus->devices[devfn]) if (!bus->devices[devfn])
goto found; goto found;
} }
error_report("PCI: no devfn available for %s, all in use", name); error_report("PCI: no slot/function available for %s, all in use", name);
return NULL; return NULL;
found: ; found: ;
} else if (bus->devices[devfn]) { } else if (bus->devices[devfn]) {
error_report("PCI: devfn %d not available for %s, in use by %s", error_report("PCI: slot %d function %d not available for %s, in use by %s",
devfn, name, bus->devices[devfn]->name); PCI_SLOT(devfn), PCI_FUNC(devfn), name, bus->devices[devfn]->name);
return NULL; return NULL;
} }
pci_dev->bus = bus; pci_dev->bus = bus;