diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f8d0a4ced4..946412242f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13830,7 +13830,7 @@ virDomainNetGetActualDirectMode(virDomainNetDefPtr iface) } virNetDevVPortProfilePtr -virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface) +virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface) { if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT) return iface->data.direct.virtPortProfile; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 59aff0dc00..4a12402239 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1873,7 +1873,7 @@ const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface); const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface); int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface); virNetDevVPortProfilePtr -virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); +virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface); virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0c22dec0b5..beb8828da1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -378,8 +378,8 @@ virDomainNetGetActualBandwidth; virDomainNetGetActualBridgeName; virDomainNetGetActualDirectDev; virDomainNetGetActualDirectMode; -virDomainNetGetActualDirectVirtPortProfile; virDomainNetGetActualType; +virDomainNetGetActualVirtPortProfile; virDomainNetIndexByMac; virDomainNetInsert; virDomainNetRemoveByMac; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b712da4617..f6f66b37dc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1242,7 +1242,7 @@ static int lxcSetupInterfaceDirect(virConnectPtr conn, * and automagically dies when the container dies. So * we have no dev to perform disassociation with. */ - prof = virDomainNetGetActualDirectVirtPortProfile(net); + prof = virDomainNetGetActualVirtPortProfile(net); if (prof) { lxcError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unable to set port profile on direct interfaces")); @@ -1260,7 +1260,7 @@ static int lxcSetupInterfaceDirect(virConnectPtr conn, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), false, false, def->uuid, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, driver->stateDir, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 99d7129b78..eb16d957d8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -154,7 +154,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), true, vnet_hdr, def->uuid, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, driver->stateDir, virDomainNetGetActualBandwidth(net)); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4870beb11..9f2ad487a2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1923,7 +1923,7 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, detach->ifname, detach->mac, virDomainNetGetActualDirectDev(detach), virDomainNetGetActualDirectMode(detach), - virDomainNetGetActualDirectVirtPortProfile(detach), + virDomainNetGetActualVirtPortProfile(detach), driver->stateDir)); VIR_FREE(detach->ifname); } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 12cfbdea20..a513b3c078 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2563,7 +2563,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { if (virNetDevVPortProfileAssociate(net->ifname, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), net->mac, virDomainNetGetActualDirectDev(net), def->uuid, @@ -2580,7 +2580,7 @@ err_exit: net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevVPortProfileDisassociate(net->ifname, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), net->mac, virDomainNetGetActualDirectDev(net), VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 143c230f6b..6f0756432b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3758,7 +3758,7 @@ void qemuProcessStop(struct qemud_driver *driver, net->ifname, net->mac, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), driver->stateDir)); VIR_FREE(net->ifname); }