From: Gleb Natapov <gleb@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com, alex.williamson@redhat.com 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 [thread overview] Message-ID: <1288525209-3303-8-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> 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 <gleb@redhat.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Gleb Natapov <gleb@redhat.com> To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [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 [thread overview] Message-ID: <1288525209-3303-8-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> 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 <gleb@redhat.com> --- 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
next prev parent reply other threads:[~2010-10-31 11:40 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-10-31 11:40 [PATCHv2 0/8 RFC] boot order specification Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 1/8] Introduce deriver_name field to DeviceInfo structure Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-11-04 9:20 ` Markus Armbruster 2010-11-04 9:20 ` Markus Armbruster 2010-11-04 9:42 ` Gleb Natapov 2010-11-04 9:42 ` Gleb Natapov 2010-11-04 14:58 ` Markus Armbruster 2010-11-04 15:44 ` Gleb Natapov 2010-11-05 14:14 ` Markus Armbruster 2010-11-05 15:41 ` Gleb Natapov 2010-11-05 16:24 ` Markus Armbruster 2010-11-05 18:31 ` Gleb Natapov 2010-11-06 9:01 ` Markus Armbruster 2010-11-06 11:53 ` Gleb Natapov 2010-11-06 12:55 ` Markus Armbruster 2010-10-31 11:40 ` [PATCHv2 2/8] Keep track of ISA ports ISA device is using in qdev Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 3/8] Add get_dev_path callback to ISA bus " Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 4/8] Store IDE bus id in IDEBus structure for easy access Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-11-03 13:39 ` Markus Armbruster 2010-11-03 13:39 ` Markus Armbruster 2010-11-03 13:47 ` Gleb Natapov 2010-11-03 13:47 ` Gleb Natapov 2010-11-03 15:18 ` Markus Armbruster 2010-11-03 16:43 ` Gleb Natapov 2010-11-03 17:22 ` Markus Armbruster 2010-11-04 8:07 ` Gleb Natapov 2010-11-04 8:46 ` Markus Armbruster 2010-11-04 9:23 ` Gleb Natapov 2010-11-04 14:22 ` Markus Armbruster 2010-11-04 15:26 ` Gleb Natapov 2010-11-05 14:04 ` Markus Armbruster 2010-11-05 15:54 ` Gleb Natapov 2010-11-05 16:31 ` Markus Armbruster 2010-11-05 18:44 ` Gleb Natapov 2010-11-06 9:25 ` Markus Armbruster 2010-11-06 11:37 ` Gleb Natapov 2010-11-06 12:46 ` Markus Armbruster 2010-10-31 11:40 ` [PATCHv2 5/8] Add get_dev_path callback to IDE bus Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 6/8] Add get_dev_path callback for system bus Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` Gleb Natapov [this message] 2010-10-31 11:40 ` [Qemu-devel] [PATCHv2 7/8] Change pci bus get_dev_path callback to print only slot and func Gleb Natapov 2010-11-08 17:17 ` Michael S. Tsirkin 2010-11-08 17:17 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 17:29 ` Gleb Natapov 2010-11-08 17:29 ` [Qemu-devel] " Gleb Natapov 2010-11-08 18:12 ` Michael S. Tsirkin 2010-11-08 18:12 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 18:22 ` Gleb Natapov 2010-11-08 18:22 ` [Qemu-devel] " Gleb Natapov 2010-11-08 21:00 ` Michael S. Tsirkin 2010-11-08 21:00 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 21:12 ` Gleb Natapov 2010-11-08 21:12 ` [Qemu-devel] " Gleb Natapov 2010-11-08 17:26 ` Michael S. Tsirkin 2010-11-08 17:26 ` [Qemu-devel] " Michael S. Tsirkin 2010-10-31 11:40 ` [PATCHv2 8/8] Add bootindex parameter to net/block/fd device Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 22:25 ` [PATCHv2 0/8 RFC] boot order specification Kevin O'Connor 2010-10-31 22:25 ` [Qemu-devel] " Kevin O'Connor 2010-11-01 7:53 ` Gleb Natapov 2010-11-01 7:53 ` [Qemu-devel] " Gleb Natapov 2010-11-04 9:24 ` Markus Armbruster 2010-11-04 9:45 ` Gleb Natapov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1288525209-3303-8-git-send-email-gleb@redhat.com \ --to=gleb@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=armbru@redhat.com \ --cc=blauwirbel@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.