External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename high level macvlan creation APIs

Browse Source 
Rename virNetDevMacVLanCreate to virNetDevMacVLanCreateWithVPortProfile
and virNetDevMacVLanDelete to virNetDevMacVLanDeleteWithVPortProfile

To make way for renaming the other macvlan creation APIs in
interface.c

* util/virnetdevmacvlan.c, util/virnetdevmacvlan.h,
  qemu/qemu_command.c, qemu/qemu_hotplug.c, qemu/qemu_process.c:
  Rename APIs
This commit is contained in:
Daniel P. Berrange 2011-11-02 17:19:48 +00:00
parent 896104c9f0
commit 191090ae27
5 changed files with 74 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_command.c
View File

@ -149,14 +149,15 @@ qemuPhysIfaceConnect(virDomainDefPtr def,
net->model && STREQ(net->model, "virtio")) net->model && STREQ(net->model, "virtio"))
vnet_hdr = 1; vnet_hdr = 1;
rc = virNetDevMacVLanCreate(net->ifname, net->mac, rc = virNetDevMacVLanCreateWithVPortProfile(
virDomainNetGetActualDirectDev(net), net->ifname, net->mac,
virDomainNetGetActualDirectMode(net), virDomainNetGetActualDirectDev(net),
vnet_hdr, def->uuid, virDomainNetGetActualDirectMode(net),
virDomainNetGetActualDirectVirtPortProfile(net), vnet_hdr, def->uuid,
&res_ifname, virDomainNetGetActualDirectVirtPortProfile(net),
vmop, driver->stateDir, &res_ifname,
virDomainNetGetActualBandwidth(net)); vmop, driver->stateDir,
virDomainNetGetActualBandwidth(net));
if (rc >= 0) { if (rc >= 0) {
virDomainAuditNetDevice(def, net, res_ifname, true); virDomainAuditNetDevice(def, net, res_ifname, true);
VIR_FREE(net->ifname); VIR_FREE(net->ifname);

11
src/qemu/qemu_hotplug.c
View File

@ -1910,11 +1910,12 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver,
virDomainConfNWFilterTeardown(detach); virDomainConfNWFilterTeardown(detach);
if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_DIRECT) { if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_DIRECT) {
ignore_value(virNetDevMacVLanDelete(detach->ifname, detach->mac, ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
virDomainNetGetActualDirectDev(detach), detach->ifname, detach->mac,
virDomainNetGetActualDirectMode(detach), virDomainNetGetActualDirectDev(detach),
virDomainNetGetActualDirectVirtPortProfile(detach), virDomainNetGetActualDirectMode(detach),
driver->stateDir)); virDomainNetGetActualDirectVirtPortProfile(detach),
driver->stateDir));
VIR_FREE(detach->ifname); VIR_FREE(detach->ifname);
} }

11
src/qemu/qemu_process.c
View File

@ -3411,11 +3411,12 @@ void qemuProcessStop(struct qemud_driver *driver,
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
ignore_value(virNetDevMacVLanDelete(net->ifname, net->mac, ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
virDomainNetGetActualDirectDev(net), net->ifname, net->mac,
virDomainNetGetActualDirectMode(net), virDomainNetGetActualDirectDev(net),
virDomainNetGetActualDirectVirtPortProfile(net), virDomainNetGetActualDirectMode(net),
driver->stateDir)); virDomainNetGetActualDirectVirtPortProfile(net),
driver->stateDir));
VIR_FREE(net->ifname); VIR_FREE(net->ifname);
} }
/* release the physical device (or any other resources used by /* release the physical device (or any other resources used by

72
src/util/virnetdevmacvlan.c
View File

@ -215,7 +215,7 @@ static const uint32_t modeMap[VIR_NETDEV_MACVLAN_MODE_LAST] = {
}; };
/** /**
* virNetDevMacVLanCreate: * virNetDevMacVLanCreateWithVPortProfile:
* Create an instance of a macvtap device and open its tap character * Create an instance of a macvtap device and open its tap character
* device. * device.
* @tgifname: Interface name that the macvtap is supposed to have. May * @tgifname: Interface name that the macvtap is supposed to have. May
@ -234,17 +234,17 @@ static const uint32_t modeMap[VIR_NETDEV_MACVLAN_MODE_LAST] = {
* negative value otherwise with error reported. * negative value otherwise with error reported.
* *
*/ */
int virNetDevMacVLanCreate(const char *tgifname, int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname,
const unsigned char *macaddress, const unsigned char *macaddress,
const char *linkdev, const char *linkdev,
enum virNetDevMacVLanMode mode, enum virNetDevMacVLanMode mode,
int vnet_hdr, int vnet_hdr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char **res_ifname, char **res_ifname,
enum virNetDevVPortProfileOp vmOp, enum virNetDevVPortProfileOp vmOp,
char *stateDir, char *stateDir,
virNetDevBandwidthPtr bandwidth) virNetDevBandwidthPtr bandwidth)
{ {
const char *type = "macvtap"; const char *type = "macvtap";
int c, rc; int c, rc;
@ -357,7 +357,7 @@ link_del_exit:
/** /**
* delMacvtap: * virNetDevMacVLanDeleteWithVPortProfile:
* @ifname : The name of the macvtap interface * @ifname : The name of the macvtap interface
* @linkdev: The interface name of the NIC to connect to the external bridge * @linkdev: The interface name of the NIC to connect to the external bridge
* @virtPortProfile: pointer to object holding the virtual port profile data * @virtPortProfile: pointer to object holding the virtual port profile data
@ -366,12 +366,12 @@ link_del_exit:
* it with the switch if port profile parameters * it with the switch if port profile parameters
* were provided. * were provided.
*/ */
int virNetDevMacVLanDelete(const char *ifname, int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
const unsigned char *macaddr, const unsigned char *macaddr,
const char *linkdev, const char *linkdev,
int mode, int mode,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char *stateDir) char *stateDir)
{ {
int ret = 0; int ret = 0;
if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) {
@ -392,29 +392,29 @@ int virNetDevMacVLanDelete(const char *ifname,
} }
#else /* ! WITH_MACVTAP */ #else /* ! WITH_MACVTAP */
int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED, int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED,
const unsigned char *macaddress ATTRIBUTE_UNUSED, const unsigned char *macaddress ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED,
enum virNetDevMacVLanMode mode ATTRIBUTE_UNUSED, enum virNetDevMacVLanMode mode ATTRIBUTE_UNUSED,
int vnet_hdr ATTRIBUTE_UNUSED, int vnet_hdr ATTRIBUTE_UNUSED,
const unsigned char *vmuuid ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED,
virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
char **res_ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED,
enum virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, enum virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED,
char *stateDir ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED,
virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED) virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED)
{ {
virReportSystemError(ENOSYS, "%s", virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform")); _("Cannot create macvlan devices on this platform"));
return -1; return -1;
} }
int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED, int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED,
const unsigned char *macaddress ATTRIBUTE_UNUSED, const unsigned char *macaddress ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED,
int mode ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
char *stateDir ATTRIBUTE_UNUSED) char *stateDir ATTRIBUTE_UNUSED)
{ {
virReportSystemError(ENOSYS, "%s", virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform")); _("Cannot create macvlan devices on this platform"));

34
src/util/virnetdevmacvlan.h
View File

@ -39,26 +39,26 @@ enum virNetDevMacVLanMode {
}; };
VIR_ENUM_DECL(virNetDevMacVLanMode) VIR_ENUM_DECL(virNetDevMacVLanMode)
int virNetDevMacVLanCreate(const char *ifname, int virNetDevMacVLanCreateWithVPortProfile(const char *ifname,
const unsigned char *macaddress, const unsigned char *macaddress,
const char *linkdev, const char *linkdev,
enum virNetDevMacVLanMode mode, enum virNetDevMacVLanMode mode,
int vnet_hdr, int vnet_hdr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char **res_ifname, char **res_ifname,
enum virNetDevVPortProfileOp vmop, enum virNetDevVPortProfileOp vmop,
char *stateDir, char *stateDir,
virNetDevBandwidthPtr bandwidth) virNetDevBandwidthPtr bandwidth)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6)
ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK;
int virNetDevMacVLanDelete(const char *ifname, int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
const unsigned char *macaddress, const unsigned char *macaddress,
const char *linkdev, const char *linkdev,
int mode, int mode,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char *stateDir) char *stateDir)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK;