From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: [PATCHv2 7/8] Change pci bus get_dev_path callback to print only slot and func Date: Sun, 31 Oct 2010 13:40:08 +0200 Message-ID: <1288525209-3303-8-git-send-email-gleb@redhat.com> References: <1288525209-3303-1-git-send-email-gleb@redhat.com> Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com, alex.williamson@redhat.com To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41031 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755389Ab0JaLkR (ORCPT ); Sun, 31 Oct 2010 07:40:17 -0400 In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Domain should be determined form parent bus and bus number is configured by guest and should not be used in qemu internally. Signed-off-by: Gleb Natapov --- hw/pci.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 92aaa85..1c5706f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -2138,12 +2138,13 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) static char *pcibus_get_dev_path(DeviceState *dev) { PCIDevice *d = (PCIDevice *)dev; - char path[16]; - - snprintf(path, sizeof(path), "%04x:%02x:%02x.%x", - pci_find_domain(d->bus), d->config[PCI_SECONDARY_BUS], - PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + char path[50]; + int off; + off = snprintf(path, sizeof(path), "%s@%x", qdev_driver_name(dev), + PCI_SLOT(d->devfn)); + if (PCI_FUNC(d->devfn)) + snprintf(path + off, sizeof(path) + off, ",%x", PCI_FUNC(d->devfn)); return strdup(path); } -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55434 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCWGp-0007mW-TB for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCWGn-0008Em-PT for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCWGn-0008EJ-Ha for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:17 -0400 From: Gleb Natapov Date: Sun, 31 Oct 2010 13:40:08 +0200 Message-Id: <1288525209-3303-8-git-send-email-gleb@redhat.com> In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> References: <1288525209-3303-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCHv2 7/8] Change pci bus get_dev_path callback to print only slot and func List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org Domain should be determined form parent bus and bus number is configured by guest and should not be used in qemu internally. Signed-off-by: Gleb Natapov --- hw/pci.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 92aaa85..1c5706f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -2138,12 +2138,13 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) static char *pcibus_get_dev_path(DeviceState *dev) { PCIDevice *d = (PCIDevice *)dev; - char path[16]; - - snprintf(path, sizeof(path), "%04x:%02x:%02x.%x", - pci_find_domain(d->bus), d->config[PCI_SECONDARY_BUS], - PCI_SLOT(d->devfn), PCI_FUNC(d->devfn)); + char path[50]; + int off; + off = snprintf(path, sizeof(path), "%s@%x", qdev_driver_name(dev), + PCI_SLOT(d->devfn)); + if (PCI_FUNC(d->devfn)) + snprintf(path + off, sizeof(path) + off, ",%x", PCI_FUNC(d->devfn)); return strdup(path); } -- 1.7.1