From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39539 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLzjP-0003mL-3W for qemu-devel@nongnu.org; Tue, 08 Jun 2010 10:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLzjC-0008V0-Fb for qemu-devel@nongnu.org; Tue, 08 Jun 2010 10:24:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23727) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLzjC-0008Up-71 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 10:24:30 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o58EOTZ3004220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Jun 2010 10:24:29 -0400 From: "Daniel P. Berrange" Date: Tue, 8 Jun 2010 15:24:25 +0100 Message-Id: <1276007065-30744-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] Clarify error message when a PCI slot is already in use (v2) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index cbbd1dd..cd7ce8d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -609,12 +609,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, if (!bus->devices[devfn]) 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; found: ; } else if (bus->devices[devfn]) { - error_report("PCI: devfn %d not available for %s, in use by %s", - devfn, name, bus->devices[devfn]->name); + error_report("PCI: slot %d function %d not available for %s, in use by %s", + PCI_SLOT(devfn), PCI_FUNC(devfn), name, bus->devices[devfn]->name); return NULL; } pci_dev->bus = bus; -- 1.6.6.1