- Devel - libvirt List Archives

Re: [libvirt] [Qemu-ppc] [RFC PATCH qemu] spapr_pci: Create PCI-express root bus by default
by Andrea Bolognani 19 Dec '16

19 Dec '16

On Tue, 2016-11-01 at 13:46 +1100, David Gibson wrote: > On Mon, Oct 31, 2016 at 03:10:23PM +1100, Alexey Kardashevskiy wrote: > > > > On 31/10/16 13:53, David Gibson wrote: > > > > > > On Fri, Oct 28, 2016 at 12:07:12PM +0200, Greg Kurz wrote: > > > > > > > > On Fri, 28 Oct 2016 18:56:40 +1100 > > > > Alexey Kardashevskiy <aik(a)ozlabs.ru> wrote: > > > > > > > > > > > > > > At the moment sPAPR PHB creates a root buf of TYPE_PCI_BUS type. > > > > > This means that vfio-pci devices attached to it (and this is > > > > > a default behaviour) hide PCIe extended capabilities as > > > > > the bus does not pass a pci_bus_is_express(pdev->bus) check. > > > > > > > > > > This changes adds a default PCI bus type property to sPAPR PHB > > > > > and uses TYPE_PCIE_BUS if none passed; older machines get TYPE_PCI_BUS > > > > > for backward compatibility as a bus type is used in the bus name > > > > > so the root bus name becomes "pcie.0" instead of "pci.0". > > > > > > > > > > Signed-off-by: Alexey Kardashevskiy <aik(a)ozlabs.ru> > > > > > --- > > > > > > > > > > What can possibly go wrong with such change of a name? > > > > > From devices prospective, I cannot see any. > > > > > > > > > > libvirt might get upset as "pci.0" will not be available, > > > > > will it make sense to create pcie.0 as a root bus and always > > > > > add a PCIe->PCI bridge and name its bus "pci.0"? > > > > > > > > > > Or create root bus from TYPE_PCIE_BUS and force name to "pci.0"? > > > > > pci_register_bus() can do this. > > > > > > > > > > > > > > > --- > > > > > hw/ppc/spapr.c | 5 +++++ > > > > > hw/ppc/spapr_pci.c | 5 ++++- > > > > > include/hw/pci-host/spapr.h | 1 + > > > > > 3 files changed, 10 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > > > > index 0b3820b..a268511 100644 > > > > > --- a/hw/ppc/spapr.c > > > > > +++ b/hw/ppc/spapr.c > > > > > @@ -2541,6 +2541,11 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", true); > > > > > .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \ > > > > > .property = "mem64_win_size", \ > > > > > .value = "0", \ > > > > > + }, \ > > > > > + { \ > > > > > + .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \ > > > > > + .property = "root_bus_type", \ > > > > > + .value = TYPE_PCI_BUS, \ > > > > > }, > > > > > > > > > > static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index, > > > > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > > > > > index 7cde30e..2fa1f22 100644 > > > > > --- a/hw/ppc/spapr_pci.c > > > > > +++ b/hw/ppc/spapr_pci.c > > > > > @@ -1434,7 +1434,9 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) > > > > > bus = pci_register_bus(dev, NULL, > > > > > pci_spapr_set_irq, pci_spapr_map_irq, sphb, > > > > > &sphb->memspace, &sphb->iospace, > > > > > - PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); > > > > > + PCI_DEVFN(0, 0), PCI_NUM_PINS, > > > > > + sphb->root_bus_type ? sphb->root_bus_type : > > > > > + TYPE_PCIE_BUS); > > > > > > > > Shouldn't we ensure that sphb->root_bus_type is either TYPE_PCIE_BUS or > > > > TYPE_PCI_BUS ? > > > > > > Yes, I think so. In fact, I think it would be better to make the > > > property a boolean that just selects PCI-E, rather than this which > > > exposes qemu (semi-)internal type names on the comamnd line. > > > > Sure, a "pcie-root" boolean property should do. > > > > However this is not my main concern, I rather wonder if we have to have > > pci.0 when we pick PCIe for the root. > > Right. > > I've added Andrea Bologna to the CC list to get a libvirt perspective. Thanks for doing so: changes such as this one can have quite an impact on the upper layers of the stack, so the earliest libvirt is involved in the discussion the better. I'm going to go a step further and cross-post to libvir-list in order to give other libvirt contributors a chance to chime in too. > Andrea, > > To summarise the issue here: > * As I've said before the PAPR spec kinda-sorta abstracts the > difference between vanilla PCI and PCI-E > * However, because within qemu we're declaring the bus as PCI that > means some PCI-E devices aren't working right > * In particular it means that PCI-E extended config space isn't > available > > The proposal is to change (on newer machine types) the spapr PHB code > to declare a PCI-E bus instead. AIUI this still won't make the root > complex guest visible (which it's not supposed to be under PAPR), and > the guest shouldn't see a difference in most cases - it will still see > the PAPR abstracted PCIish bus, but will now be able to get extended > config space. > > The possible problem from a libvirt perspective is that doing this in > the simplest way in qemu would change the name of the default bus from > pci.0 to pcie.0. We have two suggested ways to mitigate this: > 1) Automatically create a PCI-E to PCI bridge, so that new machine > types will have both a pcie.0 and pci.0 bus > 2) Force the name of the bus to be pci.0, even though it's treated > as PCI-E in other ways. > > We're trying to work out exactly what will and won't cause trouble for > libvirt. Option 2) is definitely a no-no, as we don't want to be piling up even more hacks and architecture-specific code: the PCI Express Root Bus should be called pcie.0, just as it is on q35 and mach-virt machine types. Option 1) doesn't look too bad, but devices that are added automatically by QEMU are an issue since we need to hardcode knowledge of them into libvirt if we want the rest of the PCI address allocation logic to handle them correctly. Moreover libvirt now has the ability of building a legacy PCI topology without user intervention, if needed to plug in legacy devices, on machines that have a PCI Express Root Bus, which makes the additional bridge fully redundant... ... or at least it would, if we actually had a proper PCIe-to-PCI bridge; AFAIK, though, the closest we have is the i82801b11-bridge that is Intel-specific despite having so far been abused as a generic PCIe-to-PCI bridge. I'm not even sure whether it would work at all on ppc64. Moving from legacy PCI to PCI Express would definitely be an improvement, in my opinion. As mentioned, that's already the case for at least two other architectures, so the more we can standardize on that, the better. That said, considering that a big part of the PCI address allocation logic is based off whether the specific machine type exposes a legay PCI Root Bus or a PCI Express Root Bus, libvirt will need a way to be able to tell which one is which. Version checks are pretty much out of the question, as they fail as soon as downstream releases enter the picture. A few ways we could deal with the situation: 1) switch to PCI Express on newer machine types, and expose some sort of capability through QMP so that libvirt can know about the switch 2) switch between legacy PCI and PCI Express based on a machine type option. libvirt would be able to find out whether the option is available or not, and default to either <controller type='pci' model='pci-root'/> or <controller type='pci' model='pcie-root'/> based on that. In order to support multiple PHBs properly, those would have to be switchable with an option as well 3) create an entirely new machine type, eg. pseries-pcie or whatever someone with the ability to come up with decent names can suggest :) That would make ppc64 similar to x86, where i440fx and q35 have different root buses. libvirt would learn about the new machine type, know that it has a PCI Express Root Bus, and behave accordingly Option 1) would break horribly with existing libvirt versions, and so would Option 2) if we default to using PCI Express. Option 2) with default to legacy PCI and option 3) would work just fine with existing libvirt versions AFAICT, but wouldn't of course expose the new capabilities. Option 3) is probably the one that will be less confusing to users; we might even decide to take the chance and fix other small annoyances with the current pseries machine type, if there's any. On the other hand, it might very well be considered to be too big a hammer for such a small nail. -- Andrea Bolognani / Red Hat / Virtualization

9 32

[libvirt] [PATCH] Point to the new libvirt-go bindings
by Daniel P. Berrange 19 Dec '16

19 Dec '16

The github.com/rgbkrk/libvirt-go bindings were the most complete bindings historically, but their API coverage stops at 1.2.4, with exception of a couple of newer APIs. The new bindings at http://libvirt.org/git/?p=libvirt-go.git;a=log how have (almost[1]) 100% API coverage all the way to 2.5.0. They also expose the APIs in a way that allows for much stronger go type checking by the compiler, and expose typed parameters as explicit structs. Finally the bindings are able to conditionally compile against any libvirt version 1.2.0 -> 2.5.0 without use of go build tags. Change the docs to point to these new bindings, since they'll be a better bet for users long term. [1] virEvent & virStream callbacks are still TODO to be fixed real soon. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/bindings.html.in | 4 ++-- docs/docs.html.in | 2 +- docs/downloads.html.in | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 7fe26df..dc15576 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -15,8 +15,8 @@ <a href="csharp.html">C# bindings</a>. </li> <li> - <strong>Go</strong>: Kyle Kelley et al. are developing - <a href="https://github.com/rgbkrk/libvirt-go">Go bindings</a>. + <strong>Go</strong>: Daniel Berrange develops + <a href="https://godoc.org/github.com/libvirt/libvirt-go">Go bindings</a>. </li> <li> <strong>Java</strong>: Daniel Veillard develops diff --git a/docs/docs.html.in b/docs/docs.html.in index b0d200b..60489a0 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -57,7 +57,7 @@ <dt><a href="bindings.html">Language bindings</a></dt> <dd>Bindings of the libvirt API for <a href="csharp.html">c#</a>, - <a href="https://github.com/rgbkrk/libvirt-go">go</a>, + <a href="https://godoc.org/github.com/libvirt/libvirt-go">go</a>, <a href="java.html">java</a>, <a href="http://libvirt.org/ocaml/">ocaml</a>. <a href="http://search.cpan.org/dist/Sys-Virt/">perl</a>, diff --git a/docs/downloads.html.in b/docs/downloads.html.in index dd96409..3a6ea91 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -57,6 +57,21 @@ </td> </tr> <tr> + <td>Go</td> + <td> + <a href="ftp://libvirt.org/libvirt/go/">ftp</a> + <a href="http://libvirt.org/sources/go/">http</a> + <a href="https://libvirt.org/sources/go/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a> + <a href="https://github.com/libvirt/libvirt-go">github</a> + </td> + </tr> + <tr> <td>Java</td> <td> <a href="ftp://libvirt.org/libvirt/java/">ftp</a> -- 2.9.3

2 1

[libvirt] [PATCH] xen: add QED format test
by Cédric Bosdonnat 19 Dec '16

19 Dec '16

Follow up of commit 340bb6b7 to add unit tests for the QED format support. Also add missing QED case in xenFormatXLDisk() --- src/xenconfig/xen_xl.c | 5 +++++ tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 048ecd579..65d8ffc63 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -1050,6 +1050,11 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk) case VIR_STORAGE_FILE_QCOW2: virBufferAddLit(&buf, "qcow2"); break; +#ifdef LIBXL_HAVE_QED + case VIR_STORAGE_FILE_QED: + virBufferAddLit(&buf, "qed"); + break; +#endif /* set default */ default: virBufferAddLit(&buf, "raw"); diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg index 217d4dccf..20421ffc1 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-full.cfg @@ -22,4 +22,4 @@ parallel = "none" serial = "none" builder = "hvm" boot = "d" -disk = [ "/dev/HostVG/XenGuest2,raw,hda,rw,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,qcow2,hdb,rw", "/root/boot.iso,raw,hdc,ro,devtype=cdrom" ] +disk = [ "/dev/HostVG/XenGuest2,raw,hda,rw,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,qcow2,hdb,rw", "/root/boot.iso,raw,hdc,ro,devtype=cdrom", "/var/lib/libvirt/images/XenGuest2-qed,qed,hdd,rw", ] diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml index 1bc5b436e..9c2fb41b7 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml @@ -39,6 +39,12 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qed'/> + <source file='/var/lib/libvirt/images/XenGuest2-qed'/> + <target dev='hdd' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='1'/> + </disk> <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:16:3e:66:92:9c'/> -- 2.11.0

3 2

[libvirt] [PATCH] docs: link to news file and other resources
by Daniel P. Berrange 19 Dec '16

19 Dec '16

In the website reorg we accidentally lost all links to the nice reformatted news.html file. Add a link on the front page, and also extend the download page table so that it includes links to API docs and news files for each module (where available) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/downloads.html.in | 12 ++++++++++++ docs/index.html.in | 1 + 2 files changed, 13 insertions(+) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 3a6ea91..d56e17b 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -20,6 +20,7 @@ <th>Releases</th> <th>GIT Repo</th> <th>GIT Mirrors</th> + <th>Resources</th> </tr> </thead> <tbody> @@ -37,6 +38,10 @@ <a href="https://gitlab.com/libvirt/libvirt">gitlab</a> <a href="https://github.com/libvirt/libvirt">github</a> </td> + <td> + <a href="html/index.html">api ref</a> + <a href="news.html">changes</a> + </td> </tr> <tr> <th colspan="7">Language bindings</th> @@ -70,6 +75,9 @@ <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a> <a href="https://github.com/libvirt/libvirt-go">github</a> </td> + <td> + <a href="https://godoc.org/github.com/libvirt/libvirt-go">api ref</a> + </td> </tr> <tr> <td>Java</td> @@ -113,6 +121,10 @@ <a href="https://gitlab.com/libvirt/libvirt-perl">gitlab</a> <a href="https://github.com/libvirt/libvirt-perl">github</a> </td> + <td> + <a href="http://search.cpan.org/dist/Sys-Virt/">api ref</a> + <a href="http://libvirt.org/git/?p=libvirt-perl.git;a=blob;f=Changes;hb=HEAD">changes</a> + </td> </tr> <tr> <td>PHP</td> diff --git a/docs/index.html.in b/docs/index.html.in index bcb47f7..31bd6e0 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -41,6 +41,7 @@ <li>targets Linux, FreeBSD, <a href="windows.html">Windows</a> and OS-X</li> <li>is used by many <a href="apps.html">applications</a></li> </ul> + <p>Recent / forthcoming <a href="news.html">release changes</a></p> </div> <div class="panel"> -- 2.9.3

2 1

[libvirt] [PATCH] Fix running of nosetests on python 3
by Daniel P. Berrange 19 Dec '16

19 Dec '16

Previously the way Fedora installed /usr/bin/nosetests allowed it to be invoked with either python 2 or 3. Since Fedora 25 though, it contains a module name that only exists on python 2. So we need to be more intelligent and pick a different nosetests binary per version. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- setup.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) This is technically a CI build breaker fix for rawhide, but it could do with review so I've not pushed it yet. diff --git a/setup.py b/setup.py index bbcfe87..0d65763 100755 --- a/setup.py +++ b/setup.py @@ -277,6 +277,20 @@ class my_test(Command): self.build_platlib = os.path.join(self.build_base, 'lib' + plat_specifier) + def find_nosetests_path(self): + paths = [ + "/usr/bin/nosetests-%d.%d" % (sys.version_info[0], + sys.version_info[1]), + "/usr/bin/nosetests-%d" % (sys.version_info[0]), + "/usr/bin/nosetests", + ] + + for path in paths: + if os.path.exists(path): + return path + + raise Exception("Cannot find any nosetests binary") + def run(self): """ Run test suite @@ -289,7 +303,8 @@ class my_test(Command): else: os.environ["PYTHONPATH"] = self.build_platlib self.spawn([sys.executable, "sanitytest.py", self.build_platlib, apis[0]]) - self.spawn([sys.executable, "/usr/bin/nosetests"]) + nose = self.find_nosetests_path() + self.spawn([sys.executable, nose]) class my_clean(clean): -- 2.9.3

2 1

[libvirt] [PATCH] AppArmor: allow QEMU to set_process_name.
by intrigeri 19 Dec '16

19 Dec '16

https://bugzilla.redhat.com/show_bug.cgi?id=1369281 --- examples/apparmor/libvirt-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 11381d4df0..a07291d583 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -21,6 +21,7 @@ /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, + @{PROC}/@{pid}/task/@{tid}/comm rw, @{PROC}/sys/kernel/cap_last_cap r, # For hostdev access. The actual devices will be added dynamically -- 2.11.0

5 15

[libvirt] [PATCH v3 0/3] network: Add support for local PTR domains
by Jiri Denemark 19 Dec '16

19 Dec '16

I run a system dnsmasq to be able to forward specific DNS requests to specific servers. And I have it configured for both forward and reverse lookups. Another dnsmasq is started for a virtual network with domain "virt". The system dnsmasq knows it needs to forward any requests for the "virt" domain and corresponding PTR domain to the dnsmasq started by libvirt. The problem is dnsmasq forwards queries for unknown names to the upstream name server (which is the system instance in my case). One can get nice endless loops of DNS requests pretty easily. Forward loops can be avoided by specifying localOnly='yes', but there was no way to avoid reverse lookup loops. And this is what I'm trying to address in the following patches. Version 3: - <ptr> support dropped from this series, it will be implemented separately Patches 1 and 2 from version 2 were already pushed. Version 2: - RNG schema changes and tests Jiri Denemark (3): conf: Make virNetworkIPDefParseXML a little bit saner util: Introduce virSocketAddrPTRDomain network: Add support for local PTR domains docs/formatnetwork.html.in | 21 ++++-- docs/news.html.in | 2 + docs/schemas/network.rng | 3 + src/conf/network_conf.c | 55 +++++++++------- src/conf/network_conf.h | 2 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 41 ++++++++++++ src/util/virsocketaddr.c | 85 +++++++++++++++++++++++++ src/util/virsocketaddr.h | 9 +++ tests/networkxml2confdata/ptr-domains-auto.conf | 20 ++++++ tests/networkxml2confdata/ptr-domains-auto.xml | 21 ++++++ tests/networkxml2conftest.c | 1 + 12 files changed, 232 insertions(+), 29 deletions(-) create mode 100644 tests/networkxml2confdata/ptr-domains-auto.conf create mode 100644 tests/networkxml2confdata/ptr-domains-auto.xml -- 2.11.0

2 7

[libvirt] [PATCH] perf: Consider all perf events mentioned in commandline
by Nitesh Konkar 19 Dec '16

19 Dec '16

Currently 'virsh perf domainName --enable a,b' command fails to enable/disable perf event b if perf event a has failed to get enabled/disabled. This patch fixes this issue. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0bf1856..365af37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9884,9 +9884,9 @@ qemuDomainSetPerfEvents(virDomainPtr dom, type = virPerfEventTypeFromString(param->field); if (!enabled && virPerfEventDisable(priv->perf, type) < 0) - goto endjob; + continue; if (enabled && virPerfEventEnable(priv->perf, type, vm->pid) < 0) - goto endjob; + continue; def->perf.events[type] = enabled ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; -- 1.9.3

2 1

[libvirt] About libvirt on Windows-64bit
by 孙长鹏(外网) 17 Dec '16

17 Dec '16

Hi， I wanted to use libvirt to connect to KVM in Windows-64bit，but I was failed。In fact，when I tryed that in Windows-32bit，it can be right。 Please teach me，how can I make it right in Windows-64bit？After all, the Windows-32bit is outdated。 Thank you very much。forgive my pool English。 Looking forward to your reply！ a new Java developer

2 1

[libvirt] [RFC v3] qmp: query-device-slots command
by Eduardo Habkost 17 Dec '16

17 Dec '16

Changes v2 -> v3: * Implemented a "slot set" structure, where multiple slots can be reported by using integer ranges or lists for possible values for each property. Added a ValueSet struct, that can represent a set of values using either a simple list of values, or integer ranges. (Its JSON representation is very verbose, though. See comments below). * Removed the *Properties structs, and replaced them with a simple list of SlotOption structs. * DeviceSlotInfo is not an union anymore, removed the 'type' field only because there are no slot-type-specific fields in the current implementation, but we may add it back if necessary * The implementation is very quick and dirty, the main purpose of this RFC is to evaluate the schema and returned data. Changes v1 -> v2: * Don't show sysbus unless has_dynamic_sysbus is set for the machine type * Removed max-devices and devices properties * Introduced "non-slot" slot type, to explicitly indicate we are returning info on a bus that doesn't implement slot enumeration yet. * Return bus name instead of full QOM path on "bus" field * PCI: Replaced "addr" property (string parsed by property setter) with "device-number" uint32 property * PCI: return only one slot for PCIe ports This adds a new command to QMP: query-device-slots. It will allow management software to query possible slots where devices can be plugged. This implementation of the command will return: * Multiple PCI slots per bus, in the case of PCI buses; * One slot per bus for the other buses (that don't implement slot enumeration yet); * One slot for each entry from query-hotpluggable-cpus. Representation of slot sets in JSON ----------------------------------- Slot sets are represented by a list of option names and sets of possible values for each of those options. See the SlotOption struct below for details. The representation of those sets is very verbose in this version (see below). e.g. the following set of 5 PCI functions: bus: pcie.0 device-number: 31 function: 1,4-7 Is represented in the JSON data as: "props": [ { "values": { "data": { "ranges": [ { "max": 1, "min": 1 }, { "max": 7, "min": 4 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 31 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ] We could have used something more compact like: function: 1,4-7 device-number: 31 bus: pcie.0 "props": { "function": [ 1, { 'min': 4, 'max': 7 } ], "device-number": 31, "bus": "pcie.0" } But this would probably cost us the ability of describing and validating the exact representation using the QAPI schema. I don't know which way we should go. QAPI schema ----------- The following structures were added to the QAPI schema: { 'struct': 'IntegerSet', 'data': { 'ranges': [ 'IntegerRange' ] } } { 'struct': 'IntegerRange', 'data': { 'min': 'int', 'max': 'int' } } { 'union': 'ValueSet', 'data': { 'list': [ 'any' ], 'int-set': 'IntegerSet' } } { 'struct': 'SlotOption', 'data': { 'option': 'str', 'values': 'ValueSet' } } { 'struct': 'DeviceSlotInfo', 'data': { 'accepted-device-types': [ 'str' ], 'available': 'bool', 'hotpluggable': 'bool', '*count': 'int', 'incomplete': 'bool', 'props': [ 'SlotOption' ] } } { 'command': 'query-device-slots', 'returns': [ 'DeviceSlotInfo' ] } Git tree -------- This patch needs the previous query-machines series I am working on. The full tree can be found on the git tree at: git://github.com/ehabkost/qemu-hacks.git work/query-machines-bus-info Example output -------------- The following output was returned by QEMU when running it as: $ qemu-system-x86_64 -machine q35 \ -readconfig docs/q35-chipset.cfg \ -smp 4,maxcpus=8,sockets=2,cores=2,threads=2 As the JSON output is now quite verbose, I am including the output of a script that translates the JSON data to a more human-friendly format: Slot set for: i2c-slave Incomplete set available: no hotpluggable: no valid device_add arguments: bus: i2c Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.4 Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.5 Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.0 Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.1 Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.2 Slot set for: ide-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ide.3 Slot set for: sys-bus-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: main-system-bus Slot set for: isa-device Incomplete set available: no hotpluggable: no valid device_add arguments: bus: isa.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 0 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 7 available: yes hotpluggable: no valid device_add arguments: function: 1-7 device-number: 0 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 1 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 7 available: yes hotpluggable: no valid device_add arguments: function: 1-7 device-number: 1 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 2 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 7 available: yes hotpluggable: no valid device_add arguments: function: 1-7 device-number: 2 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 26 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 1 device-number: 26 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 2 device-number: 26 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 7 device-number: 26 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 4 available: yes hotpluggable: no valid device_add arguments: function: 3-6 device-number: 26 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 27 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 7 available: yes hotpluggable: no valid device_add arguments: function: 1-7 device-number: 27 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 28 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 1 device-number: 28 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 2 device-number: 28 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 3 device-number: 28 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 4 available: yes hotpluggable: no valid device_add arguments: function: 4-7 device-number: 28 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 29 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 1 device-number: 29 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 2 device-number: 29 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 7 device-number: 29 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 4 available: yes hotpluggable: no valid device_add arguments: function: 3-6 device-number: 29 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 30 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 7 available: yes hotpluggable: no valid device_add arguments: function: 1-7 device-number: 30 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 0 device-number: 31 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 2 device-number: 31 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 1 available: no hotpluggable: no valid device_add arguments: function: 3 device-number: 31 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 5 available: yes hotpluggable: no valid device_add arguments: function: 1,4-7 device-number: 31 bus: pcie.0 Slot set for: legacy-pci-device, pci-express-device Slot count: 184 available: yes hotpluggable: no valid device_add arguments: function: 0-7 device-number: 3-25 bus: pcie.0 Slot set for: pci-express-device Slot count: 8 available: yes hotpluggable: yes valid device_add arguments: function: 0-7 device-number: 0 bus: ich9-pcie-port-1 Slot set for: pci-express-device Slot count: 8 available: yes hotpluggable: yes valid device_add arguments: function: 0-7 device-number: 0 bus: ich9-pcie-port-2 Slot set for: pci-express-device Slot count: 8 available: yes hotpluggable: yes valid device_add arguments: function: 0-7 device-number: 0 bus: ich9-pcie-port-3 Slot set for: pci-express-device Slot count: 8 available: yes hotpluggable: yes valid device_add arguments: function: 0-7 device-number: 0 bus: ich9-pcie-port-4 Slot set for: legacy-pci-device Slot count: 256 available: yes hotpluggable: no valid device_add arguments: function: 0-7 device-number: 0-31 bus: ich9-pci-bridge Slot set for: usb-device Incomplete set available: yes hotpluggable: yes valid device_add arguments: bus: ich9-ehci-1.0 Slot set for: usb-device Incomplete set available: yes hotpluggable: yes valid device_add arguments: bus: ich9-ehci-2.0 Slot set for: hda-codec Incomplete set available: no hotpluggable: no valid device_add arguments: bus: ich9-hda-audio.0 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: yes hotpluggable: yes valid device_add arguments: socket-id: 1 thread-id: 1 core-id: 1 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: yes hotpluggable: yes valid device_add arguments: socket-id: 1 thread-id: 0 core-id: 1 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: yes hotpluggable: yes valid device_add arguments: socket-id: 1 thread-id: 1 core-id: 0 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: yes hotpluggable: yes valid device_add arguments: socket-id: 1 thread-id: 0 core-id: 0 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: no hotpluggable: yes valid device_add arguments: socket-id: 0 thread-id: 1 core-id: 1 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: no hotpluggable: yes valid device_add arguments: socket-id: 0 thread-id: 0 core-id: 1 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: no hotpluggable: yes valid device_add arguments: socket-id: 0 thread-id: 1 core-id: 0 Slot set for: qemu64-x86_64-cpu Slot count: 1 available: no hotpluggable: yes valid device_add arguments: socket-id: 0 thread-id: 0 core-id: 0 Raw JSON data for the above: { "return": [ { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "i2c" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "i2c-slave" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.4" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.5" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.0" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.1" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.2" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ide.3" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "ide-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "main-system-bus" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "sys-bus-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "isa.0" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "isa-device" ] }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 7, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 1, "min": 1 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 7, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 1, "min": 1 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 7, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 26, "min": 26 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 1, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 26, "min": 26 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 26, "min": 26 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 7 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 26, "min": 26 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 4, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 6, "min": 3 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 26, "min": 26 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 27, "min": 27 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 7, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 27, "min": 27 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 28, "min": 28 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 1, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 28, "min": 28 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 28, "min": 28 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 3, "min": 3 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 28, "min": 28 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 4, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 4 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 28, "min": 28 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 29, "min": 29 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 1, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 29, "min": 29 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 29, "min": 29 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 7 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 29, "min": 29 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 4, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 6, "min": 3 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 29, "min": 29 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 30, "min": 30 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 7, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 1 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 30, "min": 30 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 31 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 2, "min": 2 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 31 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 3, "min": 3 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 31 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 5, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 1, "min": 1 }, { "max": 7, "min": 4 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 31 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 184, "accepted-device-types": [ "legacy-pci-device", "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 25, "min": 3 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "pcie.0" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "count": 8, "accepted-device-types": [ "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "ich9-pcie-port-1" ], "type": "list" }, "option": "bus" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 8, "accepted-device-types": [ "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "ich9-pcie-port-2" ], "type": "list" }, "option": "bus" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 8, "accepted-device-types": [ "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "ich9-pcie-port-3" ], "type": "list" }, "option": "bus" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 8, "accepted-device-types": [ "pci-express-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 0, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "ich9-pcie-port-4" ], "type": "list" }, "option": "bus" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 256, "accepted-device-types": [ "legacy-pci-device" ], "props": [ { "values": { "data": { "ranges": [ { "max": 7, "min": 0 } ] }, "type": "int-set" }, "option": "function" }, { "values": { "data": { "ranges": [ { "max": 31, "min": 0 } ] }, "type": "int-set" }, "option": "device-number" }, { "values": { "data": [ "ich9-pci-bridge" ], "type": "list" }, "option": "bus" } ], "hotpluggable": false, "incomplete": false }, { "available": true, "hotpluggable": true, "props": [ { "values": { "data": [ "ich9-ehci-1.0" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "usb-device" ] }, { "available": true, "hotpluggable": true, "props": [ { "values": { "data": [ "ich9-ehci-2.0" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "usb-device" ] }, { "available": false, "hotpluggable": false, "props": [ { "values": { "data": [ "ich9-hda-audio.0" ], "type": "list" }, "option": "bus" } ], "incomplete": true, "accepted-device-types": [ "hda-codec" ] }, { "available": true, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 1 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 1 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 1 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": true, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 1 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 0 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 0 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 0 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 1 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false }, { "available": false, "count": 1, "accepted-device-types": [ "qemu64-x86_64-cpu" ], "props": [ { "values": { "data": [ 0 ], "type": "list" }, "option": "socket-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "thread-id" }, { "values": { "data": [ 0 ], "type": "list" }, "option": "core-id" } ], "hotpluggable": true, "incomplete": false } ] } Cc: Marcel Apfelbaum <marcel(a)redhat.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: libvir-list(a)redhat.com, Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Laine Stump <laine(a)redhat.com> Cc: "Michael S. Tsirkin" <mst(a)redhat.com> Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- --- qapi-schema.json | 109 ++++++++++ scripts/qmp/query-slots.py | 50 +++++ include/hw/qdev-core.h | 6 + include/qapi/qobject-output-visitor.h | 9 + hw/core/bus.c | 45 +++++ hw/pci/pci.c | 363 +++++++++++++++++++++++++++++++--- qapi/qobject-output-visitor.c | 14 ++ qdev-monitor.c | 128 +++++++++++- tests/qmp-machine-info.py | 72 +++++-- 9 files changed, 746 insertions(+), 50 deletions(-) create mode 100755 scripts/qmp/query-slots.py diff --git a/qapi-schema.json b/qapi-schema.json index d48ff3f..3d597b5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3165,6 +3165,115 @@ ## { 'command': 'closefd', 'data': {'fdname': 'str'} } + +## +# @IntegerSet: +# +# A set of integers. +## +{ 'struct': 'IntegerSet', + 'data': { 'ranges': [ 'IntegerRange' ] } } + +## +# @IntegerRange: +# +# A contiguous range of integers. +# +# @min: The first value in the range +# @max: The last value in the range +## +{ 'struct': 'IntegerRange', + 'data': { 'min': 'int', 'max': 'int' } } + +## +# @ValueSet: +# +# A set of values. +# +# @list: A set of elements in a list. +# +# @int-set: A set represented by an IntegerSet. +## +{ 'union': 'ValueSet', + 'data': { 'list': [ 'any' ], 'int-set': 'IntegerSet' } } + +## +# @SlotOption: +# +# A option to be used when plugging a device to a slot. +# +# @option: Option name. +# +# @values: Set of valid option values. +## +{ 'struct': 'SlotOption', + 'data': { 'option': 'str', 'values': 'ValueSet' } } + +## +# @DeviceSlotInfo: +# +# Information on a set of slots where devices can be plugged. +# +# @type: type of device slot. +# +# @accepted-device-types: List of device types accepted by the slots. +# Any device plugged to the slot should implement +# one of the accepted device types. +# +# @available: If false, the slot is not available for plugging any device. +# This value can change at runtime if condition changes +# (e.g. if the slot becomes full, or if the machine +# was already initialized and the slot doesn't support +# hotplug). +# +# @hotpluggable: If true, the slot accepts hotplugged devices. +# +# @count: #optional Number of slots represented by this slot set. +# Will always be present if @incomplete=false. +# +# @incomplete: Slot information is incomplete. Slot count is not +# available, and additional arguments are missing +# on @props. +# +# @props: Information on the arguments that should be given to +# @device_add if plugging a device to this slot. +# +# How to interpret @props +# ----------------------- +# +# Each key/value pair in @props represent an option that should +# be set when using @device_add to plug a new device. +# +# Each value in @props represent a single value that should be +# provided to @device_add, or a set of possible values for the option. +# +# Incomplete Slot Sets +# -------------------- +# +# Slot sets with @incomplete=true represent a bus that doesn't +# support slot enumeration yet. Slots of this type should be replaced +# by more detailed slot sets in future QEMU versions. +# +# Slots of this type may or may not support multiple devices. +# +# Slots in incomplete slot sets might require extra arguments to +# be set to specify the device address. +## +{ 'struct': 'DeviceSlotInfo', + 'data': { 'accepted-device-types': [ 'str' ], + 'available': 'bool', 'hotpluggable': 'bool', + '*count': 'int', 'incomplete': 'bool', + 'props': [ 'SlotOption' ] } } + +## +# @query-device-slots: +# +# Return the list of possible slots for plugging devices using +# @device_add. +## +{ 'command': 'query-device-slots', + 'returns': [ 'DeviceSlotInfo' ] } + ## # @MachineBusInfo # diff --git a/scripts/qmp/query-slots.py b/scripts/qmp/query-slots.py new file mode 100755 index 0000000..02c60b7 --- /dev/null +++ b/scripts/qmp/query-slots.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# test script to dump slot info in a more human-friendly way + +import qmp +import sys + +q = qmp.QEMUMonitorProtocol(sys.argv[1]) +q.connect() +slots = q.command('query-device-slots') +for slot in slots: + types = slot.pop('accepted-device-types') + print 'Slot set for: %s' % (', '.join(types)) + inc = slot.pop('incomplete') + if inc: + print ' Incomplete set' + else: + count = slot.pop('count') + print ' Slot count: %d' % (count) + props = slot.pop('props') + for k,v in slot.items(): + if type(v) == bool: + if v: + v = 'yes' + else: + v = 'no' + elif type(v) == unicode: + v = str(v) + else: + v = repr(v) + print ' %s: %s' % (k, v) + + print ' valid device_add arguments:' + for p in props: + option = p.pop('option') + values = p.pop('values') + assert not p # no other field + valuestr = repr(values) + if values['type'] == 'list': + valuestr = ', '.join(str(v) for v in values['data']) + elif values['type'] == 'int-set': + ranges = [] + for r in values['data']['ranges']: + if r['max'] == r['min']: + ranges.append('%d' % (r['max'])) + else: + ranges.append('%d-%d' % (r['min'], r['max'])) + valuestr = ','.join(ranges) + else: + assert False + print ' %s: %s' % (option, valuestr) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index a7f9ac4..2cb043a 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -214,6 +214,10 @@ struct BusClass { * but on some cases bus instances may override it. */ const char *device_type; + + /*TODO: write doc */ + DeviceSlotInfoList *(*enumerate_slots)(BusState *bus, Error **errp); + }; typedef struct BusChild { @@ -412,4 +416,6 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); +bool qbus_is_full(BusState *bus); + #endif diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-output-visitor.h index 8241877..319985e 100644 --- a/include/qapi/qobject-output-visitor.h +++ b/include/qapi/qobject-output-visitor.h @@ -16,6 +16,7 @@ #include "qapi/visitor.h" #include "qapi/qmp/qobject.h" +#include "qapi/error.h" typedef struct QObjectOutputVisitor QObjectOutputVisitor; @@ -27,4 +28,12 @@ typedef struct QObjectOutputVisitor QObjectOutputVisitor; */ Visitor *qobject_output_visitor_new(QObject **result); +QObject *qapi_to_qobject(const void *src, + void (*visit_fn)(Visitor *, const char *, + void**, Error **)); + +#define QAPI_TO_QOBJ(type, src) \ + (qapi_to_qobject((src), (void (*)(Visitor *, const char *, void**, \ + Error **))visit_type_ ## type)) + #endif diff --git a/hw/core/bus.c b/hw/core/bus.c index d2bf717..2f47fe1 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -21,7 +21,9 @@ #include "qemu-common.h" #include "hw/qdev.h" #include "qapi/error.h" +#include "qapi/clone-visitor.h" #include "qapi-visit.h" +#include "qapi/qmp/qstring.h" static void qbus_set_hotplug_handler_internal(BusState *bus, Object *handler, Error **errp) @@ -225,12 +227,55 @@ static void bus_get_device_type(Object *obj, Visitor *v, visit_type_strList(v, NULL, &bus->accepted_device_types, errp); } +bool qbus_is_full(BusState *bus) +{ + BusClass *bus_class = BUS_GET_CLASS(bus); + return bus_class->max_dev && bus->max_index >= bus_class->max_dev; +} + +/* Generic slot enumeration function that will return a generic-slot slot type. + */ +static DeviceSlotInfoList *bus_generic_enumerate_slots(BusState *bus, Error **errp) +{ + Error *local_err = NULL; + DeviceSlotInfoList *r = g_new0(DeviceSlotInfoList, 1); + + r->value = g_new0(DeviceSlotInfo, 1); + r->value->accepted_device_types = QAPI_CLONE(strList, bus->accepted_device_types); + + r->value->hotpluggable = qbus_is_hotpluggable(bus); + + r->value->incomplete = true; + + /* Conditions that make a bus unavailable: + * - Bus already full + * - Hotplug when the bus is not hotpluggable + */ + r->value->available = + !(qbus_is_full(bus) || + (qdev_hotplug && !qbus_is_hotpluggable(bus))); + + + /* r->value->props = { 'bus': bus->name } */ + r->value->props = g_new0(SlotOptionList, 1); + r->value->props->value = g_new0(SlotOption, 1); + r->value->props->value->option = g_strdup("bus"); + r->value->props->value->values = g_new0(ValueSet, 1); + r->value->props->value->values->type = VALUE_SET_KIND_LIST;; + r->value->props->value->values->u.list.data = g_new0(anyList, 1); + r->value->props->value->values->u.list.data->value = QOBJECT(qstring_from_str(bus->name)); + + error_propagate(errp, local_err); + return r; +} + static void bus_class_init(ObjectClass *class, void *data) { BusClass *bc = BUS_CLASS(class); class->unparent = bus_unparent; bc->get_fw_dev_path = default_bus_get_fw_dev_path; + bc->enumerate_slots = bus_generic_enumerate_slots; object_class_property_add(class, "accepted-device-types", "strList", bus_get_device_type, NULL, NULL, NULL, diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2eac71a..26721a6 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -41,6 +41,8 @@ #include "hw/hotplug.h" #include "hw/boards.h" #include "qemu/cutils.h" +#include "qapi/clone-visitor.h" +#include "qapi/qmp/qstring.h" //#define DEBUG_PCI #ifdef DEBUG_PCI @@ -141,6 +143,8 @@ static uint16_t pcibus_numa_node(PCIBus *bus) return NUMA_NODE_UNASSIGNED; } +static DeviceSlotInfoList *pci_bus_enumerate_slots(BusState *bus, Error **errp); + static void pci_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); @@ -156,6 +160,7 @@ static void pci_bus_class_init(ObjectClass *klass, void *data) * but overrides BusClass::device_type to INTERFACE_PCIE_DEVICE */ k->device_type = INTERFACE_LEGACY_PCI_DEVICE; + k->enumerate_slots = pci_bus_enumerate_slots; pbc->is_root = pcibus_is_root; pbc->bus_num = pcibus_num; @@ -967,6 +972,274 @@ uint16_t pci_requester_id(PCIDevice *dev) return pci_req_id_cache_extract(&dev->requester_id_cache); } +static bool pci_bus_has_pcie_upstream_port(PCIBus *bus) +{ + PCIDevice *parent_dev = pci_bridge_get_device(bus); + + /* Device associated with an upstream port. + * As there are several types of these, it's easier to check the + * parent device: upstream ports are always connected to + * root or downstream ports. + */ + return parent_dev && + pci_is_express(parent_dev) && + parent_dev->exp.exp_cap && + (pcie_cap_get_type(parent_dev) == PCI_EXP_TYPE_ROOT_PORT || + pcie_cap_get_type(parent_dev) == PCI_EXP_TYPE_DOWNSTREAM); +} + +static PCIDevice *pci_bus_get_function_0(PCIBus *bus, int devfn) +{ + if(pci_bus_has_pcie_upstream_port(bus)) { + /* With an upstream PCIe port, we only support 1 device at slot 0 */ + return bus->devices[0]; + } else { + /* Other bus types might support multiple devices at slots 0-31 */ + return bus->devices[PCI_DEVFN(PCI_SLOT(devfn), 0)]; + } +} + +PCIDevice *pci_get_function_0(PCIDevice *pci_dev) +{ + return pci_bus_get_function_0(pci_dev->bus, pci_dev->devfn); +} + +static bool int_set_empty(IntegerSet *set) +{ + return !set->ranges; +} + +static int int_range_size(IntegerRange *range) +{ + return range->max - range->min + 1; +} + +static int int_set_size(IntegerSet *set) +{ + int r = 0; + IntegerRangeList *rl; + for (rl = set->ranges; rl; rl = rl->next) { + r += int_range_size(rl->value); + } + return r; +} + +static void int_set_add(IntegerSet *set, int min, int max) +{ + IntegerRangeList *rl; + IntegerRangeList **pnext = &set->ranges; + IntegerRangeList *prev = NULL; + + for (rl = set->ranges; rl; rl = rl->next) { + IntegerRange *r = rl->value; + if (max < r->min - 1) { + goto insert; + } else if (max <= r->max) { + r->min = min; + goto try_merge_back; + } else if (min == r->max + 1) { + r->max = max; + goto try_merge_front; + } else { + pnext = &rl->next; + prev = rl; + } + } + +insert: + rl = g_new0(IntegerRangeList, 1); + rl->value = g_new0(IntegerRange, 1); + rl->value->min = min; + rl->value->max = max; + rl->next = *pnext; + *pnext = rl; + +try_merge_back: + /*TODO: can't merge more than 1 range */ + if (prev && prev->value->max == rl->value->min - 1) { + prev->value->max = rl->value->max; + prev->next = rl->next; + g_free(rl); + } + +try_merge_front: + while (rl->next && rl->value->max + 1 == rl->next->value->min) { + IntegerRangeList *old = rl->next; + rl->next = old->next; + g_free(old); + } +} + +static ValueSet *new_slot_prop(DeviceSlotInfo *slot, const char *option, ValueSetKind type) +{ + SlotOptionList *l = g_new0(SlotOptionList, 1); + SlotOption *opt = g_new0(SlotOption, 1); + ValueSet *vs = g_new0(ValueSet, 1); + + vs->type = type; + opt->option = g_strdup(option); + opt->values = vs; + l->value = opt; + l->next = slot->props; + slot->props = l; + return vs; +} + +static void value_set_list_append(ValueSet *vs, QObject *value) +{ + anyList *new = g_new0(anyList, 1); + + assert(vs->type == VALUE_SET_KIND_LIST); + new->value = value; + new->next = vs->u.list.data; + vs->u.list.data = new; +} + +static DeviceSlotInfoList *pci_bus_enumerate_slots(BusState *bus, Error **errp) +{ + PCIBus *pb = PCI_BUS(bus); + int devnr, devnrs; + DeviceSlotInfoList *r = NULL; + DeviceSlotInfoList **next = &r; + IntegerSet *empty_slots = g_new0(IntegerSet, 1); + + if (pci_bus_has_pcie_upstream_port(pb)) { + devnrs = 1; + } else { + devnrs = PCI_SLOT_MAX; + } + + /* Each PCI devfn (device number + function) is a separate slot, + * because we implement multi-function PCI devices as separate + * device objects. + * + * As an experiment, return a slot set for each device number. + */ + for(devnr = PCI_SLOT(pb->devfn_min); devnr < devnrs; devnr++) { + IntegerSet *empty_funcs = g_new0(IntegerSet, 1); + + int func; + for (func = 0; func < PCI_FUNC_MAX; func++) { + if (pb->devices[PCI_DEVFN(devnr, func)]) { + break; + } + } + if (func == PCI_FUNC_MAX) { + /* All functions are empty, we can return the whole slot in the "empty" slot set */ + int_set_add(empty_slots, devnr, devnr); + continue; + } + + /* Not all functions are empty, so return one entry for each function */ + for (func = 0; func < PCI_FUNC_MAX; func++) { + /* Empty functions will be reported as a single slot set later: */ + if (!pb->devices[PCI_DEVFN(devnr, func)]) { + int_set_add(empty_funcs, func, func); + continue; + } + + DeviceSlotInfoList *i = g_new0(DeviceSlotInfoList, 1); + i->value = g_new0(DeviceSlotInfo, 1); + /*TODO: add info about accepting only bridges on extra PCI root buses */ + i->value->accepted_device_types = QAPI_CLONE(strList, bus->accepted_device_types); + + i->value->hotpluggable = qbus_is_hotpluggable(bus); + + /* Conditions that make a devnr unavailable: + * - function already occupied + * - function 0 already occupied by a device + * - Hotplug when the bus is not hotpluggable + */ + i->value->available = + !((pb->devices[PCI_DEVFN(devnr, func)]) || + (pb->devices[PCI_DEVFN(devnr, 0)]) || + (0 && qdev_hotplug && !qbus_is_hotpluggable(bus))); + + ValueSet *bus_values = new_slot_prop(i->value, "bus", VALUE_SET_KIND_LIST); + value_set_list_append(bus_values, QOBJECT(qstring_from_str(bus->name))); + + ValueSet *dev_values = new_slot_prop(i->value, "device-number", VALUE_SET_KIND_INT_SET); + dev_values->u.int_set.data = g_new0(IntegerSet, 1); + int_set_add(dev_values->u.int_set.data, devnr, devnr); + + ValueSet *func_values = new_slot_prop(i->value, "function", VALUE_SET_KIND_INT_SET); + func_values->u.int_set.data = g_new0(IntegerSet, 1); + int_set_add(func_values->u.int_set.data, func, func); + + i->value->has_count = true; + i->value->count = 1; + + *next = i; + next = &i->next; + } + + if (!int_set_empty(empty_funcs)) { + DeviceSlotInfoList *i = g_new0(DeviceSlotInfoList, 1); + i->value = g_new0(DeviceSlotInfo, 1); + /*TODO: add info about accepting only bridges on extra PCI root buses */ + i->value->accepted_device_types = QAPI_CLONE(strList, bus->accepted_device_types); + + i->value->hotpluggable = qbus_is_hotpluggable(bus); + + i->value->available = + !(0 && qdev_hotplug && !qbus_is_hotpluggable(bus)); + + ValueSet *bus_values = new_slot_prop(i->value, "bus", VALUE_SET_KIND_LIST); + value_set_list_append(bus_values, QOBJECT(qstring_from_str(bus->name))); + + ValueSet *dev_values = new_slot_prop(i->value, "device-number", VALUE_SET_KIND_INT_SET); + dev_values->u.int_set.data = g_new0(IntegerSet, 1); + int_set_add(dev_values->u.int_set.data, devnr, devnr); + + ValueSet *func_values = new_slot_prop(i->value, "function", VALUE_SET_KIND_INT_SET); + func_values->u.int_set.data = empty_funcs; + + i->value->has_count = true; + i->value->count = int_set_size(empty_funcs); + + *next = i; + next = &i->next; + } else { + qapi_free_IntegerSet(empty_slots); + } + } + + /* Return a single slot set for the empty slots */ + if (!int_set_empty(empty_slots)) { + DeviceSlotInfoList *i = g_new0(DeviceSlotInfoList, 1); + i->value = g_new0(DeviceSlotInfo, 1); + /*TODO: add info about accepting only bridges on extra PCI root buses */ + i->value->accepted_device_types = QAPI_CLONE(strList, bus->accepted_device_types); + + i->value->hotpluggable = qbus_is_hotpluggable(bus); + + /* Conditions that make a devnr unavailable: + * - function 0 already occupied by a device + * - Hotplug when the bus is not hotpluggable + */ + i->value->available = !(0 && qdev_hotplug && !qbus_is_hotpluggable(bus)); + + ValueSet *bus_values = new_slot_prop(i->value, "bus", VALUE_SET_KIND_LIST); + value_set_list_append(bus_values, QOBJECT(qstring_from_str(bus->name))); + + ValueSet *dev_values = new_slot_prop(i->value, "device-number", VALUE_SET_KIND_INT_SET); + dev_values->u.int_set.data = empty_slots; + + ValueSet *func_values = new_slot_prop(i->value, "function", VALUE_SET_KIND_INT_SET); + func_values->u.int_set.data = g_new0(IntegerSet, 1); + int_set_add(func_values->u.int_set.data, 0, PCI_FUNC_MAX - 1); + + i->value->has_count = true; + i->value->count = PCI_FUNC_MAX * int_set_size(empty_slots); + + *next = i; + next = &i->next; + } else { + qapi_free_IntegerSet(empty_slots); + } + return r; +} + /* -1 for devfn means auto assign */ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn, @@ -2509,6 +2782,56 @@ MemoryRegion *pci_address_space_io(PCIDevice *dev) return dev->bus->address_space_io; } +static void pci_device_get_devnr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCIDevice *dev = PCI_DEVICE(obj); + uint32_t devnr = PCI_SLOT(dev->devfn); + + visit_type_uint32(v, "device-number", &devnr, errp); +} + +static void pci_device_set_devnr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCIDevice *dev = PCI_DEVICE(obj); + uint32_t devnr; + Error *local_err = NULL; + + visit_type_uint32(v, "device-number", &devnr, &local_err); + if (local_err) { + goto out; + } + dev->devfn = PCI_DEVFN(devnr, PCI_FUNC(dev->devfn)); +out: + error_propagate(errp, local_err); +} + +static void pci_device_get_function(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCIDevice *dev = PCI_DEVICE(obj); + uint32_t function = PCI_FUNC(dev->devfn); + + visit_type_uint32(v, "function", &function, errp); +} + +static void pci_device_set_function(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PCIDevice *dev = PCI_DEVICE(obj); + uint32_t function; + Error *local_err = NULL; + + visit_type_uint32(v, "function", &function, &local_err); + if (local_err) { + goto out; + } + dev->devfn = PCI_DEVFN(PCI_SLOT(dev->devfn), function); +out: + error_propagate(errp, local_err); +} + static void pci_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k = DEVICE_CLASS(klass); @@ -2519,6 +2842,19 @@ static void pci_device_class_init(ObjectClass *klass, void *data) k->bus_type = TYPE_PCI_BUS; k->props = pci_props; pc->realize = pci_default_realize; + + /* Internally, bits 3:8 of devfn are called "slots", but: + * - they can be confused with physical slot numbers; + * - TYPE_PCIE_SLOT objects already have a "slot" property. + * So we use the terminology used in the PCI specifiction: + * "device number". + */ + object_class_property_add(klass, "device-number", "uint32", + pci_device_get_devnr, pci_device_set_devnr, + NULL, NULL, &error_abort); + object_class_property_add(klass, "function", "uint32", + pci_device_get_function, pci_device_set_function, + NULL, NULL, &error_abort); } static void pci_device_class_base_init(ObjectClass *klass, void *data) @@ -2607,33 +2943,6 @@ void pci_bus_get_w64_range(PCIBus *bus, Range *range) pci_for_each_device_under_bus(bus, pci_dev_get_w64, range); } -static bool pcie_has_upstream_port(PCIDevice *dev) -{ - PCIDevice *parent_dev = pci_bridge_get_device(dev->bus); - - /* Device associated with an upstream port. - * As there are several types of these, it's easier to check the - * parent device: upstream ports are always connected to - * root or downstream ports. - */ - return parent_dev && - pci_is_express(parent_dev) && - parent_dev->exp.exp_cap && - (pcie_cap_get_type(parent_dev) == PCI_EXP_TYPE_ROOT_PORT || - pcie_cap_get_type(parent_dev) == PCI_EXP_TYPE_DOWNSTREAM); -} - -PCIDevice *pci_get_function_0(PCIDevice *pci_dev) -{ - if(pcie_has_upstream_port(pci_dev)) { - /* With an upstream PCIe port, we only support 1 device at slot 0 */ - return pci_dev->bus->devices[0]; - } else { - /* Other bus types might support multiple devices at slots 0-31 */ - return pci_dev->bus->devices[PCI_DEVFN(PCI_SLOT(pci_dev->devfn), 0)]; - } -} - MSIMessage pci_get_msi_message(PCIDevice *dev, int vector) { MSIMessage msg; diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 8711270..86c3e1b 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -252,3 +252,17 @@ Visitor *qobject_output_visitor_new(QObject **result) return &v->visitor; } + +QObject *qapi_to_qobject(const void *src, + void (*visit_fn)(Visitor *, const char *, + void**, Error **)) +{ + QObject *qobj = NULL; + void *obj = (void *) src; + Visitor *v = qobject_output_visitor_new(&qobj); + + visit_fn(v, "unused", &obj, &error_abort); + visit_complete(v, &qobj); + visit_free(v); + return qobj; +} diff --git a/qdev-monitor.c b/qdev-monitor.c index c73410c..4df29c4 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -29,6 +29,9 @@ #include "qemu/error-report.h" #include "qemu/help_option.h" #include "sysemu/block-backend.h" +#include "qapi/clone-visitor.h" +#include "qapi/qobject-output-visitor.h" +#include "hw/boards.h" /* * Aliases were a bad idea from the start. Let's keep them @@ -399,12 +402,6 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem) return NULL; } -static inline bool qbus_is_full(BusState *bus) -{ - BusClass *bus_class = BUS_GET_CLASS(bus); - return bus_class->max_dev && bus->max_index >= bus_class->max_dev; -} - /* * Search the tree rooted at @bus for a bus. * If @name, search for a bus with that name. Note that bus names @@ -631,6 +628,125 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) return dev; } +typedef struct SlotListState { + MachineState *machine; + DeviceSlotInfoList *result; + DeviceSlotInfoList **next; + Error *err; +} SlotListState; + +static int walk_bus(Object *obj, void *opaque) +{ + SlotListState *s = opaque; + + /* sysbus is special: never return it unless the machine + * supports dynamic sysbus devices. + */ + if (object_dynamic_cast(obj, TYPE_BUS) && + (!object_dynamic_cast(obj, TYPE_SYSTEM_BUS) || + MACHINE_GET_CLASS(s->machine)->has_dynamic_sysbus)) { + BusState *bus = BUS(obj); + BusClass *bc = BUS_GET_CLASS(bus); + DeviceSlotInfoList *l = bc->enumerate_slots(bus, &s->err); + *s->next = l; + for (; l; l = l->next) { + s->next = &l->next; + } + if (s->err) { + return 1; + } + } + return 0; +} + +static void add_option(const char *key, QObject *obj, void *opaque) +{ + SlotOptionList **l = opaque; + SlotOption *opt = g_new0(SlotOption, 1); + SlotOptionList *new = g_new0(SlotOptionList, 1); + + opt->option = g_strdup(key); + opt->values = g_new0(ValueSet, 1); + opt->values->type = VALUE_SET_KIND_LIST; + opt->values->u.list.data = g_new0(anyList, 1); + opt->values->u.list.data->value = obj; + qobject_incref(obj); + + new->next = *l; + new->value = opt; + *l = new; +} + +/* Convert a simple QDict to a list of single-value slot properties */ +static void qdict_to_slot_props(QDict *d, SlotOptionList **l) +{ + qdict_iter(d, add_option, l); +} + +static QObject *cpu_instance_props_to_qobj(CpuInstanceProperties *src, Error **errp) +{ + QObject *qobj = NULL; + Visitor *v = qobject_output_visitor_new(&qobj); + + visit_type_CpuInstanceProperties(v, "unused", &src, &error_abort); + visit_complete(v, &qobj); + visit_free(v); + return qobj; +} + +DeviceSlotInfoList *qmp_query_device_slots(Error **errp) +{ + SlotListState s = { }; + MachineState *ms = MACHINE(qdev_get_machine()); + MachineClass *mc = MACHINE_GET_CLASS(ms); + + s.machine = ms; + s.next = &s.result; + + /* We build the device slot list from two sources: + * 1) Calling the BusClass::enumerate_slots() method on all buses; + * 2) The return value of MachineClass::query_hotpluggable_cpus() + */ + + + object_child_foreach_recursive(qdev_get_machine(), walk_bus, &s); + if (s.err) { + goto out; + } + + if (mc->query_hotpluggable_cpus) { + HotpluggableCPUList *hcl = mc->query_hotpluggable_cpus(ms); + HotpluggableCPUList *i; + + for (i = hcl; i; i = i->next) { + DeviceSlotInfoList *r = g_new0(DeviceSlotInfoList, 1); + HotpluggableCPU *hc = i->value; + QObject *props; + + r->value = g_new0(DeviceSlotInfo, 1); + r->value->accepted_device_types = g_new0(strList, 1); + r->value->accepted_device_types->value = g_strdup(hc->type); + r->value->available = !hc->has_qom_path; + /*TODO: should it be always true? */ + r->value->hotpluggable = true; + r->value->has_count = true; + r->value->count = 1; + + props = cpu_instance_props_to_qobj(hc->props, &s.err); + qdict_to_slot_props(qobject_to_qdict(props), &r->value->props); + + *s.next = r; + s.next = & r->next; + } + + qapi_free_HotpluggableCPUList(hcl); + } + +out: + error_propagate(errp, s.err); + return s.result; +} + #define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__) static void qbus_print(Monitor *mon, BusState *bus, int indent); diff --git a/tests/qmp-machine-info.py b/tests/qmp-machine-info.py index 7905afb..850e89a 100755 --- a/tests/qmp-machine-info.py +++ b/tests/qmp-machine-info.py @@ -6,6 +6,8 @@ import qtest import unittest import logging import argparse +import itertools +import operator logger = logging.getLogger('qemu.tests.machineinfo') @@ -35,6 +37,34 @@ NODEFAULTS_BLACKLIST = set([ 'z2', # "qemu: missing SecureDigital device" ]) +# iterators for QAPI ValueSets: +# all of the iterators below should support iter() and len() + +def int_range(d): + """Iterator for IntegerRange""" + return xrange(d['min'], d['max'] + 1) + +class IntegerSet: + """Iterator for IntegerSet""" + def __init__(self, d): + self._ranges = d['ranges'] + + def __iter__(self): + iters = [int_range(r) for r in self._ranges] + return itertools.chain(*iters) + + def __len__(self): + return sum([len(int_range(r)) for r in self._ranges]) + +def value_set(d): + """Iterator for ValueSet""" + if d['type'] == 'list': + return d['data'] + elif d['type'] == 'int-set': + return IntegerSet(d['data']) + else: + raise NotImplementedError + class QueryMachinesTest(unittest.TestCase): def setUp(self): self.vm = None @@ -154,9 +184,12 @@ class QueryMachinesTest(unittest.TestCase): types_to_check = {} buses_to_check = {} for slot in slots: - if slot['props'].has_key('bus'): - bus = slot['props']['bus'] - buses_to_check.setdefault(bus, []).append(slot) + for prop in slot['props']: + if prop['option'] == 'bus': + values = value_set(bus['values']) + self.assertEquals(len(values), 1) + bus = values[0] + buses_to_check.setdefault(v, []).append(slot) for t in slot['accepted-device-types']: types_to_check.setdefault(t, set()).update(slot['props'].keys()) @@ -185,27 +218,32 @@ class QueryMachinesTest(unittest.TestCase): self.assertFalse(slot['available']) def checkSlotInfo(self, args): - #TODO: - # * check if -device works with at least one device type - # * check if query-hotpluggable-cpus matches what's in query-device-slots - # * check if accepted-device-types match the property on the bus - # * check if available=false if len(devices) >= max-devices - # * check if all plugged devices are really in the QOM tree + #TODO: check if: + # * -device works with at least one device type + # * query-hotpluggable-cpus matches what's in query-device-slots + # * accepted-device-types match the property on the bus + # * available=false if hotpluggable=false + # * 'count' is always set if not incomplete + # * slot count is <= set of possible values for @props self.vm = qtest.QEMUQtestMachine(args=args, logging=False) self.vm.launch() slots = self.vm.command('query-device-slots') - self.checkSlotProps(slots) + #self.checkSlotProps(slots) #self.checkSlotDevices(slots) - self.checkAvailableField(slots) + #self.checkAvailableField(slots) + + for slot in slots: + logging.debug('slot: %r', slot) + if not slot['incomplete']: + self.assertTrue(slot.has_key('count')) + + all_counts = [len(value_set(p['values'])) for p in slot['props']] + total_count = reduce(operator.mul, all_counts, 1) + logging.debug('%d possible values', total_count) + self.assertEquals(total_count, slot['count']) def machineTestSlotInfo(self, machine): - #TODO: - # * check if -device works with at least one device type - # * check if query-hotpluggable-cpus matches what's in query-device-slots - # * check if accepted-device-types match the property on the bus - # * check if available=false if len(devices) >= max-devices - # * check if all plugged devices are really in the QOM tree if machine['name'] in BLACKLIST: self.skipTest("machine %s on BLACKLIST" % (machine['name'])) -- 2.7.4

1 0