This series depends on another one: https://www.redhat.com/archives/libvir-list/2016-July/msg00696.html Because the address sets are no longer cached, it's possible to move functions that don't depend on qemu anymore from qemu_domain_address.c to domain_addr.c. I did that with virtioSerial and PCI. To make some functions not dependent on qemuCaps, their parameters were changed to booleans. These changes are in [PATCH 02/13]. If you are satisfied with this approach, I can do the same with the rest of the functions or just some of them. Tomasz Flendrich (13): Move and rename qemuDomainAssignVirtioSerialAddresses make pci address handling functions qemu-agnostic Move and rename qemuDomainCollectPCIAddress Move and rename qemuDomainMachineIsQ35 et al Move and rename qemuDomainValidateDevicePCISlotsPIIX3 Move and rename qemuDomainValidateDevicePCISlotsQ35 Move and rename qemuDomainValidateDevicePCISlotsChipsets Move and rename qemuDomainAddressFindNewBusNr et al Move and rename qemuDomainMachineIsVirt Move and rename qemuDomainSupportsPCI Move and rename qemuDomainPCIAddrSetCreateFromDomain Move and rename qemuDomainAssignPCIAddresses et al Make functions in qemu_domain_address static src/conf/domain_addr.c | 1315 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_addr.h | 28 + src/libvirt_private.syms | 6 + src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 20 +- src/qemu/qemu_domain.c | 55 +- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_domain_address.c | 1284 +-------------------------------------- src/qemu/qemu_domain_address.h | 4 - src/qemu/qemu_hotplug.c | 33 +- 11 files changed, 1406 insertions(+), 1350 deletions(-) -- 2.7.4 (Apple Git-66) -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list