Another rebase of the series with no other changes

Laine Stump (8):
  conf: use struct instead of int for each slot in
    virDomainPCIAddressBus
  conf: eliminate concept of "reserveEntireSlot"
  conf: eliminate repetitive code in virDomainPCIAddressGetNextSlot()
  conf: start search for next unused PCI address at same slot as
    previous find
  conf: new function virDomainPCIAddressIsMulti()
  qemu: use virDomainPCIAddressIsMulti() to determine multifunction
    setting
  conf: aggregate multiple devices on a slot when assigning PCI
    addresses
  conf: aggregate multiple pcie-root-ports onto a single slot

 src/conf/domain_addr.c                             | 290 ++++++++++++++-------
 src/conf/domain_addr.h                             |  48 +++-
 src/libvirt_private.syms                           |   1 +
 src/qemu/qemu_command.c                            |  16 +-
 src/qemu/qemu_domain_address.c                     |  35 ++-
 .../qemuxml2argv-pcie-root-port.args               |   5 +-
 .../qemuxml2argv-pcie-switch-upstream-port.args    |   5 +-
 .../qemuxml2argv-q35-default-devices-only.args     |   7 +-
 .../qemuxml2argv-q35-multifunction.args            |  43 +++
 .../qemuxml2argv-q35-multifunction.xml             |  51 ++++
 .../qemuxml2argv-q35-pcie-autoadd.args             |  30 ++-
 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args  |  28 +-
 .../qemuxml2argv-q35-virt-manager-basic.args       |  13 +-
 .../qemuxml2argv-q35-virtio-pci.args               |  28 +-
 tests/qemuxml2argvtest.c                           |  25 ++
 .../qemuxml2xmlout-pcie-root-port.xml              |   2 +-
 .../qemuxml2xmlout-pcie-switch-upstream-port.xml   |   4 +-
 .../qemuxml2xmlout-q35-default-devices-only.xml    |   8 +-
 .../qemuxml2xmlout-q35-multifunction.xml           | 120 +++++++++
 .../qemuxml2xmlout-q35-pcie-autoadd.xml            |  52 ++--
 .../qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml |  48 ++--
 .../qemuxml2xmlout-q35-virt-manager-basic.xml      |  20 +-
 .../qemuxml2xmlout-q35-virtio-pci.xml              |  48 ++--
 tests/qemuxml2xmltest.c                            |  25 ++
 24 files changed, 676 insertions(+), 276 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.xml
 create mode 100644 
tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-multifunction.xml

-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Reply via email to