Re: [PATCHv3 1/3] util:netlink: Enable virNetlinkNewLink to support veth

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 12/16/20 1:01 AM, Shi Lei wrote:
Signed-off-by: Shi Lei <shi_lei@xxxxxxxxxxxxxx>
---
  src/util/virnetlink.c | 14 ++++++++++++++
  src/util/virnetlink.h |  1 +
  2 files changed, 15 insertions(+)

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index fdd3a6a4..8625b896 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -24,6 +24,7 @@
  #include <config.h>
#include <unistd.h>
+#include <linux/veth.h>


^^ This #include had to be moved down inside the #if defined(WITH_LIBNL) to avoid build failures on mingw, MacOS, and FreeBSD. I squashed in that change before pushing.



#include "virnetlink.h"
  #include "virnetdev.h"
@@ -535,6 +536,19 @@ virNetlinkNewLink(const char *ifname,
          NETLINK_MSG_NEST_END(nl_msg, infodata);
      }
+ if (STREQ(type, "veth") && extra_args && extra_args->veth_peer) {
+        struct nlattr *infoveth = NULL;
+
+        NETLINK_MSG_NEST_START(nl_msg, infodata, IFLA_INFO_DATA);
+        NETLINK_MSG_NEST_START(nl_msg, infoveth, VETH_INFO_PEER);
+        nlmsg_reserve(nl_msg, sizeof(struct ifinfomsg), 0);
+        NETLINK_MSG_PUT(nl_msg, IFLA_IFNAME,
+                        (strlen(extra_args->veth_peer) + 1),
+                        extra_args->veth_peer);
+        NETLINK_MSG_NEST_END(nl_msg, infoveth);
+        NETLINK_MSG_NEST_END(nl_msg, infodata);
+    }
+
      NETLINK_MSG_NEST_END(nl_msg, linkinfo);
if (extra_args) {
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 7121eac4..7c4ed202 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -84,6 +84,7 @@ struct _virNetlinkNewLinkData {
      const int *ifindex;             /* The index for the 'link' device */
      const virMacAddr *mac;          /* The MAC address of the device */
      const uint32_t *macvlan_mode;   /* The mode of macvlan */
+    const char *veth_peer;          /* The peer name for veth */
  };
int virNetlinkNewLink(const char *ifname,





[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux