Re: [libvirt] [PATCH 10/10] network: internal API functions to manage assignment of physdev to guest

The network driver needs to assign physical devices for use by modes that use macvtap, keeping track of which physical devices are in use (and how many instances, when the devices can be shared). Three calls are added: networkAllocateActualDevice - finds a physical device for use by the domain, and sets up the virDomainActualNetDef accordingly. networkNotifyActualDevice - assumes that the domain was already running, but libvirtd was restarted, and needs to be notified by each already-running domain about what interfaces they are using. networkReleaseActualDevice - decrements the usage count of the allocated physical device, and frees the virDomainActualNetDef to avoid later accidentally using the device. bridge_driver.[hc] - the new APIs qemu_(command|driver|hotplug|process).c - add calls to the above APIs in the appropriate places. tests/Makefile.am - need to include libvirt_driver_network.la whenever libvirt_driver_qemu.la is linked, to avoid unreferenced symbols (in functions that are never called by the test programs...) --- src/network/bridge_driver.c | 398 +++++++++++++++++++++++++++++++++++++++++++ src/network/bridge_driver.h | 6 + src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_hotplug.c | 41 +++-- src/qemu/qemu_process.c | 26 +++- tests/Makefile.am | 12 +- 6 files changed, 476 insertions(+), 18 deletions(-)

+ + /* Find the most specific virtportprofile and copy it */ + if (iface->data.network.virtPortProfile) { + virtport = iface->data.network.virtPortProfile; + } else { + virPortGroupDefPtr portgroup + = virPortGroupFindByName(netdef, iface->data.network.portgroup); + if (portgroup) + virtport = portgroup->virtPortProfile;

+ if (!netdef->forwardDev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' uses a direct mode, but has no forward dev and no interface pool"), + netdef->name); + goto cleanup; + } + iface->data.network.actual->data.direct.linkdev + = strdup(netdef->forwardDev);

+int +networkNotifyActualDevice(virDomainNetDefPtr iface) +{

+ + /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both require + * exclusive access to a device, so current usageCount must be + * 0 in those cases. + */ + if ((dev->usageCount > 0) && + ((netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH) || + ((netdef->forwardType == VIR_NETWORK_FORWARD_PRIVATE) && + iface->data.network.actual->data.direct.virtPortProfile && + (iface->data.network.actual->data.direct.virtPortProfile->virtPortType + == VIR_VIRTUALPORT_8021QBH)))) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' claims dev='%s' is already in use by a different domain"),