virNetDevLinkDump should have been in virnetlink.c, but that file didn't exist yet when the function was created. It didn't really matter until now - I found that having virnetlink.h included by virnetdev.h caused build problems when trying to #include virnetdev.h in a .c file in src/conf (due to missing directory in -I). Rather than fix that to further institutionalize the incorrect placement of this one function, this patch moves the function. --- src/libvirt_private.syms | 2 +- src/util/virnetdev.c | 134 +------------------------------------- src/util/virnetdev.h | 6 -- src/util/virnetdevvportprofile.c | 4 +- src/util/virnetlink.c | 135 +++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 5 ++ 6 files changed, 145 insertions(+), 141 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 501c23e..00fa673 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1872,7 +1872,6 @@ virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; virNetDevGetVLanID; virNetDevIsVirtualFunction; -virNetDevLinkDump; virNetDevReplaceMacAddress; virNetDevReplaceNetConfig; virNetDevRestoreMacAddress; @@ -1986,6 +1985,7 @@ virNetDevVPortProfileOpTypeToString; # util/virnetlink.h virNetlinkCommand; virNetlinkDelLink; +virNetlinkDumpLink; virNetlinkEventAddClient; virNetlinkEventRemoveClient; virNetlinkEventServiceIsRunning; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5a4ccc6..4cd51cb 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -23,6 +23,7 @@ #include <config.h> #include "virnetdev.h" +#include "virnetlink.h" #include "virmacaddr.h" #include "virfile.h" #include "virerror.h" @@ -2086,124 +2087,6 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { .maxlen = sizeof(struct ifla_vf_vlan) }, }; -/** - * virNetDevLinkDump: - * - * @ifname: The name of the interface; only use if ifindex <= 0 - * @ifindex: The interface index; may be <= 0 if ifname is given - * @data: Gets a pointer to the raw data from netlink. - MUST BE FREED BY CALLER! - * @nlattr: Pointer to a pointer of netlink attributes that will contain - * the results - * @src_pid: pid used for nl_pid of the local end of the netlink message - * (0 == "use getpid()") - * @dst_pid: pid of destination nl_pid if the kernel - * is not the target of the netlink message but it is to be - * sent to another process (0 if sending to the kernel) - * - * Get information from netlink about an interface given its name or index. - * - * Returns 0 on success, -1 on fatal error. - */ -int -virNetDevLinkDump(const char *ifname, int ifindex, - void **nlData, struct nlattr **tb, - uint32_t src_pid, uint32_t dst_pid) -{ - int rc = -1; - struct nlmsghdr *resp = NULL; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { - .ifi_family = AF_UNSPEC, - .ifi_index = ifindex - }; - unsigned int recvbuflen; - struct nl_msg *nl_msg; - - if (ifname && ifindex <= 0 && virNetDevGetIndex(ifname, &ifindex) < 0) - return -1; - - ifinfo.ifi_index = ifindex; - - nl_msg = nlmsg_alloc_simple(RTM_GETLINK, NLM_F_REQUEST); - if (!nl_msg) { - virReportOOMError(); - return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (ifname) { - if (nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) - goto buffer_too_small; - } - -# ifdef RTEXT_FILTER_VF - /* if this filter exists in the kernel's netlink implementation, - * we need to set it, otherwise the response message will not - * contain the IFLA_VFINFO_LIST that we're looking for. - */ - { - uint32_t ifla_ext_mask = RTEXT_FILTER_VF; - - if (nla_put(nl_msg, IFLA_EXT_MASK, - sizeof(ifla_ext_mask), &ifla_ext_mask) < 0) { - goto buffer_too_small; - } - } -# endif - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, - src_pid, dst_pid, NETLINK_ROUTE, 0) < 0) - goto cleanup; - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - if (err->error) { - virReportSystemError(-err->error, - _("error dumping %s (%d) interface"), - ifname, ifindex); - goto cleanup; - } - break; - - case GENL_ID_CTRL: - case NLMSG_DONE: - rc = nlmsg_parse(resp, sizeof(struct ifinfomsg), - tb, IFLA_MAX, NULL); - if (rc < 0) - goto malformed_resp; - break; - - default: - goto malformed_resp; - } - rc = 0; - cleanup: - nlmsg_free(nl_msg); - if (rc < 0) - VIR_FREE(resp); - *nlData = resp; - return rc; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - goto cleanup; - - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - goto cleanup; -} static int virNetDevSetVfConfig(const char *ifname, int ifindex, int vf, @@ -2398,7 +2281,7 @@ virNetDevGetVfConfig(const char *ifname, int vf, virMacAddrPtr mac, struct nlattr *tb[IFLA_MAX + 1] = {NULL, }; int ifindex = -1; - rc = virNetDevLinkDump(ifname, ifindex, &nlData, tb, 0, 0); + rc = virNetlinkDumpLink(ifname, ifindex, &nlData, tb, 0, 0); if (rc < 0) goto cleanup; @@ -2640,19 +2523,6 @@ virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir) #else /* defined(__linux__) && defined(HAVE_LIBNL) */ int -virNetDevLinkDump(const char *ifname ATTRIBUTE_UNUSED, - int ifindex ATTRIBUTE_UNUSED, - void **nlData ATTRIBUTE_UNUSED, - struct nlattr **tb ATTRIBUTE_UNUSED, - uint32_t src_pid ATTRIBUTE_UNUSED, - uint32_t dst_pid ATTRIBUTE_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Unable to dump link info on this platform")); - return -1; -} - -int virNetDevReplaceNetConfig(const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index cbe7938..522536f 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -27,7 +27,6 @@ # include "virbitmap.h" # include "virsocketaddr.h" -# include "virnetlink.h" # include "virmacaddr.h" # include "virpci.h" # include "virnetdevvlan.h" @@ -170,11 +169,6 @@ int virNetDevGetVirtualFunctions(const char *pfname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; -int virNetDevLinkDump(const char *ifname, int ifindex, - void **nlData, struct nlattr **tb, - uint32_t src_pid, uint32_t dst_pid) - ATTRIBUTE_RETURN_CHECK; - int virNetDevReplaceNetConfig(const char *linkdev, int vf, const virMacAddr *macaddress, virNetDevVlanPtr vlan, diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 8100656..db495a7 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -880,7 +880,7 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int while (!end && i <= nthParent) { VIR_FREE(nlData); - rc = virNetDevLinkDump(ifname, ifindex, &nlData, tb, 0, 0); + rc = virNetlinkDumpLink(ifname, ifindex, &nlData, tb, 0, 0); if (rc < 0) break; @@ -964,7 +964,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex, while (--repeats >= 0) { VIR_FREE(nlData); - rc = virNetDevLinkDump(NULL, ifindex, &nlData, tb, src_pid, dst_pid); + rc = virNetlinkDumpLink(NULL, ifindex, &nlData, tb, src_pid, dst_pid); if (rc < 0) goto cleanup; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 513f36e..a5d10fa 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -36,6 +36,7 @@ #include <sys/socket.h> #include "virnetlink.h" +#include "virnetdev.h" #include "virlog.h" #include "viralloc.h" #include "virthread.h" @@ -316,6 +317,126 @@ int virNetlinkCommand(struct nl_msg *nl_msg, /** + * virNetlinkDumpLink: + * + * @ifname: The name of the interface; only use if ifindex <= 0 + * @ifindex: The interface index; may be <= 0 if ifname is given + * @data: Gets a pointer to the raw data from netlink. + MUST BE FREED BY CALLER! + * @nlattr: Pointer to a pointer of netlink attributes that will contain + * the results + * @src_pid: pid used for nl_pid of the local end of the netlink message + * (0 == "use getpid()") + * @dst_pid: pid of destination nl_pid if the kernel + * is not the target of the netlink message but it is to be + * sent to another process (0 if sending to the kernel) + * + * Get information from netlink about an interface given its name or index. + * + * Returns 0 on success, -1 on fatal error. + */ +int +virNetlinkDumpLink(const char *ifname, int ifindex, + void **nlData, struct nlattr **tb, + uint32_t src_pid, uint32_t dst_pid) +{ + int rc = -1; + struct nlmsghdr *resp = NULL; + struct nlmsgerr *err; + struct ifinfomsg ifinfo = { + .ifi_family = AF_UNSPEC, + .ifi_index = ifindex + }; + unsigned int recvbuflen; + struct nl_msg *nl_msg; + + if (ifname && ifindex <= 0 && virNetDevGetIndex(ifname, &ifindex) < 0) + return -1; + + ifinfo.ifi_index = ifindex; + + nl_msg = nlmsg_alloc_simple(RTM_GETLINK, NLM_F_REQUEST); + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (ifname) { + if (nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) + goto buffer_too_small; + } + +# ifdef RTEXT_FILTER_VF + /* if this filter exists in the kernel's netlink implementation, + * we need to set it, otherwise the response message will not + * contain the IFLA_VFINFO_LIST that we're looking for. + */ + { + uint32_t ifla_ext_mask = RTEXT_FILTER_VF; + + if (nla_put(nl_msg, IFLA_EXT_MASK, + sizeof(ifla_ext_mask), &ifla_ext_mask) < 0) { + goto buffer_too_small; + } + } +# endif + + if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, + src_pid, dst_pid, NETLINK_ROUTE, 0) < 0) + goto cleanup; + + if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) + goto malformed_resp; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + if (err->error) { + virReportSystemError(-err->error, + _("error dumping %s (%d) interface"), + ifname, ifindex); + goto cleanup; + } + break; + + case GENL_ID_CTRL: + case NLMSG_DONE: + rc = nlmsg_parse(resp, sizeof(struct ifinfomsg), + tb, IFLA_MAX, NULL); + if (rc < 0) + goto malformed_resp; + break; + + default: + goto malformed_resp; + } + rc = 0; + cleanup: + nlmsg_free(nl_msg); + if (rc < 0) + VIR_FREE(resp); + *nlData = resp; + return rc; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + goto cleanup; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; +} + + +/** * virNetlinkDelLink: * * @ifname: Name of the link @@ -923,6 +1044,20 @@ int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, int +virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSED, + int ifindex ATTRIBUTE_UNUSED, + void **nlData ATTRIBUTE_UNUSED, + struct nlattr **tb ATTRIBUTE_UNUSED, + uint32_t src_pid ATTRIBUTE_UNUSED, + uint32_t dst_pid ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to dump link info on this platform")); + return -1; +} + + +int virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUSED, virNetlinkDelLinkFallback fallback ATTRIBUTE_UNUSED) { diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 0664a7a..11e817c 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -58,6 +58,11 @@ int virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback); int virNetlinkGetErrorCode(struct nlmsghdr *resp, unsigned int recvbuflen); +int virNetlinkDumpLink(const char *ifname, int ifindex, + void **nlData, struct nlattr **tb, + uint32_t src_pid, uint32_t dst_pid) + ATTRIBUTE_RETURN_CHECK; + typedef void (*virNetlinkEventHandleCallback)(struct nlmsghdr *, unsigned int length, struct sockaddr_nl *peer, -- 2.5.5

These had been declared in conf/device_conf.h, but then used in util/virnetdev.c, meaning that we had to #include conf/device_conf.h in virnetdev.c (which we have for a long time said shouldn't be done. This caused a bigger problem when I tried to #include util/virnetdev.h in a file in src/conf (which is allowed) - for some reason the "device_conf.h: File not found" error. The solution is to move the data types and functions used in util sources from conf to util. Some names were adjusted during the move ("virInterface" --> "virNetDevIf", and "VIR_INTERFACE" --> "VIR_NETDEV_IF") --- src/conf/device_conf.c | 31 ++++--------------------------- src/conf/device_conf.h | 44 +++----------------------------------------- src/conf/domain_conf.c | 1 + src/conf/interface_conf.h | 2 +- src/conf/node_device_conf.h | 2 +- src/libvirt_private.syms | 6 ++++-- src/util/virnetdev.c | 31 +++++++++++++++++++++++++++---- src/util/virnetdev.h | 40 ++++++++++++++++++++++++++++++++++++++-- tests/virnetdevtest.c | 14 +++++++------- 9 files changed, 86 insertions(+), 85 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 4280513..f58b9d0 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -32,29 +32,6 @@ #define VIR_FROM_THIS VIR_FROM_DEVICE -VIR_ENUM_IMPL(virInterfaceState, - VIR_INTERFACE_STATE_LAST, - "" /* value of zero means no state */, - "unknown", "notpresent", - "down", "lowerlayerdown", - "testing", "dormant", "up") - -VIR_ENUM_IMPL(virNetDevFeature, - VIR_NET_DEV_FEAT_LAST, - "rx", - "tx", - "sg", - "tso", - "gso", - "gro", - "lro", - "rxvlan", - "txvlan", - "ntuple", - "rxhash", - "rdma", - "txudptnl") - int virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report) { @@ -196,7 +173,7 @@ virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, int virInterfaceLinkParseXML(xmlNodePtr node, - virInterfaceLinkPtr lnk) + virNetDevIfLinkPtr lnk) { int ret = -1; char *stateStr, *speedStr; @@ -206,7 +183,7 @@ virInterfaceLinkParseXML(xmlNodePtr node, speedStr = virXMLPropString(node, "speed"); if (stateStr) { - if ((state = virInterfaceStateTypeFromString(stateStr)) < 0) { + if ((state = virNetDevIfStateTypeFromString(stateStr)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown link state: %s"), stateStr); @@ -232,7 +209,7 @@ virInterfaceLinkParseXML(xmlNodePtr node, int virInterfaceLinkFormat(virBufferPtr buf, - const virInterfaceLink *lnk) + const virNetDevIfLink *lnk) { if (!lnk->speed && !lnk->state) { /* If there's nothing to format, return early. */ @@ -244,7 +221,7 @@ virInterfaceLinkFormat(virBufferPtr buf, virBufferAsprintf(buf, " speed='%u'", lnk->speed); if (lnk->state) virBufferAsprintf(buf, " state='%s'", - virInterfaceStateTypeToString(lnk->state)); + virNetDevIfStateTypeToString(lnk->state)); virBufferAddLit(buf, "/>\n"); return 0; } diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 847564b..fdd7c3c 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -32,45 +32,7 @@ # include "virthread.h" # include "virbuffer.h" # include "virpci.h" - -typedef enum { - VIR_INTERFACE_STATE_UNKNOWN = 1, - VIR_INTERFACE_STATE_NOT_PRESENT, - VIR_INTERFACE_STATE_DOWN, - VIR_INTERFACE_STATE_LOWER_LAYER_DOWN, - VIR_INTERFACE_STATE_TESTING, - VIR_INTERFACE_STATE_DORMANT, - VIR_INTERFACE_STATE_UP, - VIR_INTERFACE_STATE_LAST -} virInterfaceState; - -VIR_ENUM_DECL(virInterfaceState) - -typedef struct _virInterfaceLink virInterfaceLink; -typedef virInterfaceLink *virInterfaceLinkPtr; -struct _virInterfaceLink { - virInterfaceState state; /* link state */ - unsigned int speed; /* link speed in Mbits per second */ -}; - -typedef enum { - VIR_NET_DEV_FEAT_GRXCSUM, - VIR_NET_DEV_FEAT_GTXCSUM, - VIR_NET_DEV_FEAT_GSG, - VIR_NET_DEV_FEAT_GTSO, - VIR_NET_DEV_FEAT_GGSO, - VIR_NET_DEV_FEAT_GGRO, - VIR_NET_DEV_FEAT_LRO, - VIR_NET_DEV_FEAT_RXVLAN, - VIR_NET_DEV_FEAT_TXVLAN, - VIR_NET_DEV_FEAT_NTUPLE, - VIR_NET_DEV_FEAT_RXHASH, - VIR_NET_DEV_FEAT_RDMA, - VIR_NET_DEV_FEAT_TXUDPTNL, - VIR_NET_DEV_FEAT_LAST -} virNetDevFeature; - -VIR_ENUM_DECL(virNetDevFeature) +# include "virnetdev.h" typedef enum { VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE, @@ -216,9 +178,9 @@ bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, virPCIDeviceAddress *addr2); int virInterfaceLinkParseXML(xmlNodePtr node, - virInterfaceLinkPtr lnk); + virNetDevIfLinkPtr lnk); int virInterfaceLinkFormat(virBufferPtr buf, - const virInterfaceLink *lnk); + const virNetDevIfLink *lnk); #endif /* __DEVICE_CONF_H__ */ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 75ad03f..8ff836c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -53,6 +53,7 @@ #include "network_conf.h" #include "virtpm.h" #include "virstring.h" +#include "virnetdev.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index ac212fb..5cabec7 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -147,7 +147,7 @@ struct _virInterfaceDef { char *name; /* interface name */ unsigned int mtu; /* maximum transmit size in byte */ char *mac; /* MAC address */ - virInterfaceLink lnk; /* interface link info */ + virNetDevIfLink lnk; /* interface link info */ virInterfaceStartMode startmode; /* how it is started */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index be6dd5e..9e3e6fe 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -140,7 +140,7 @@ typedef struct _virNodeDevCapData { char *address; unsigned int address_len; char *ifname; - virInterfaceLink lnk; + virNetDevIfLink lnk; virNodeDevNetCapType subtype; /* LAST -> no subtype */ virBitmapPtr features; /* enum virNetDevFeature */ } net; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 00fa673..df2dfc3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -78,8 +78,6 @@ virCPUModeTypeToString; # conf/device_conf.h virInterfaceLinkFormat; virInterfaceLinkParseXML; -virInterfaceStateTypeFromString; -virInterfaceStateTypeToString; virPCIDeviceAddressEqual; virPCIDeviceAddressFormat; virPCIDeviceAddressIsValid; @@ -1855,6 +1853,8 @@ virNetDevAddRoute; virNetDevClearIPAddress; virNetDevDelMulti; virNetDevExists; +virNetDevFeatureTypeFromString; +virNetDevFeatureTypeToString; virNetDevGetFeatures; virNetDevGetIndex; virNetDevGetIPAddress; @@ -1871,6 +1871,8 @@ virNetDevGetVirtualFunctionIndex; virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; virNetDevGetVLanID; +virNetDevIfStateTypeFromString; +virNetDevIfStateTypeToString; virNetDevIsVirtualFunction; virNetDevReplaceMacAddress; virNetDevReplaceNetConfig; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 4cd51cb..fb71c7b 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2547,10 +2547,33 @@ virNetDevRestoreNetConfig(const char *linkdev ATTRIBUTE_UNUSED, #endif /* defined(__linux__) && defined(HAVE_LIBNL) */ +VIR_ENUM_IMPL(virNetDevIfState, + VIR_NETDEV_IF_STATE_LAST, + "" /* value of zero means no state */, + "unknown", "notpresent", + "down", "lowerlayerdown", + "testing", "dormant", "up") + +VIR_ENUM_IMPL(virNetDevFeature, + VIR_NET_DEV_FEAT_LAST, + "rx", + "tx", + "sg", + "tso", + "gso", + "gro", + "lro", + "rxvlan", + "txvlan", + "ntuple", + "rxhash", + "rdma", + "txudptnl") + #ifdef __linux__ int virNetDevGetLinkInfo(const char *ifname, - virInterfaceLinkPtr lnk) + virNetDevIfLinkPtr lnk) { int ret = -1; char *path = NULL; @@ -2580,7 +2603,7 @@ virNetDevGetLinkInfo(const char *ifname, /* We shouldn't allow 0 here, because * virInterfaceState enum starts from 1. */ - if ((tmp_state = virInterfaceStateTypeFromString(buf)) <= 0) { + if ((tmp_state = virNetDevIfStateTypeFromString(buf)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse: %s"), buf); @@ -2593,7 +2616,7 @@ virNetDevGetLinkInfo(const char *ifname, * report several misleading values. While igb reports 65535, realtek goes * with 10. To avoid muddying XML with insane values, don't report link * speed if that's the case. */ - if (lnk->state != VIR_INTERFACE_STATE_UP) { + if (lnk->state != VIR_NETDEV_IF_STATE_UP) { lnk->speed = 0; ret = 0; goto cleanup; @@ -2638,7 +2661,7 @@ virNetDevGetLinkInfo(const char *ifname, int virNetDevGetLinkInfo(const char *ifname, - virInterfaceLinkPtr lnk) + virNetDevIfLinkPtr lnk) { /* Port me */ VIR_DEBUG("Getting link info on %s is not implemented on this platform", diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 522536f..849f8e7 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -30,7 +30,6 @@ # include "virmacaddr.h" # include "virpci.h" # include "virnetdevvlan.h" -# include "device_conf.h" # ifdef HAVE_STRUCT_IFREQ typedef struct ifreq virIfreq; @@ -74,6 +73,43 @@ struct _virNetDevRxFilter { } vlan; }; +typedef enum { + VIR_NETDEV_IF_STATE_UNKNOWN = 1, + VIR_NETDEV_IF_STATE_NOT_PRESENT, + VIR_NETDEV_IF_STATE_DOWN, + VIR_NETDEV_IF_STATE_LOWER_LAYER_DOWN, + VIR_NETDEV_IF_STATE_TESTING, + VIR_NETDEV_IF_STATE_DORMANT, + VIR_NETDEV_IF_STATE_UP, + VIR_NETDEV_IF_STATE_LAST +} virNetDevIfState; + +VIR_ENUM_DECL(virNetDevIfState) + +typedef struct { + virNetDevIfState state; /* link state */ + unsigned int speed; /* link speed in Mbits per second */ +} virNetDevIfLink, *virNetDevIfLinkPtr; + +typedef enum { + VIR_NET_DEV_FEAT_GRXCSUM, + VIR_NET_DEV_FEAT_GTXCSUM, + VIR_NET_DEV_FEAT_GSG, + VIR_NET_DEV_FEAT_GTSO, + VIR_NET_DEV_FEAT_GGSO, + VIR_NET_DEV_FEAT_GGRO, + VIR_NET_DEV_FEAT_LRO, + VIR_NET_DEV_FEAT_RXVLAN, + VIR_NET_DEV_FEAT_TXVLAN, + VIR_NET_DEV_FEAT_NTUPLE, + VIR_NET_DEV_FEAT_RXHASH, + VIR_NET_DEV_FEAT_RDMA, + VIR_NET_DEV_FEAT_TXUDPTNL, + VIR_NET_DEV_FEAT_LAST +} virNetDevFeature; + +VIR_ENUM_DECL(virNetDevFeature) + int virNetDevSetupControl(const char *ifname, virIfreq *ifr) ATTRIBUTE_RETURN_CHECK; @@ -187,7 +223,7 @@ int virNetDevGetFeatures(const char *ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetLinkInfo(const char *ifname, - virInterfaceLinkPtr lnk) + virNetDevIfLinkPtr lnk) ATTRIBUTE_NONNULL(1); virNetDevRxFilterPtr virNetDevRxFilterNew(void) diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 3987a8a..7c8a03f 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -30,7 +30,7 @@ struct testVirNetDevGetLinkInfoData { const char *ifname; /* ifname to get info on */ - virInterfaceState state; /* expected state */ + virNetDevIfState state; /* expected state */ unsigned int speed; /* expected speed */ }; @@ -39,7 +39,7 @@ testVirNetDevGetLinkInfo(const void *opaque) { int ret = -1; const struct testVirNetDevGetLinkInfoData *data = opaque; - virInterfaceLink lnk; + virNetDevIfLink lnk; if (virNetDevGetLinkInfo(data->ifname, &lnk) < 0) goto cleanup; @@ -47,8 +47,8 @@ testVirNetDevGetLinkInfo(const void *opaque) if (lnk.state != data->state) { fprintf(stderr, "Fetched link state (%s) doesn't match the expected one (%s)", - virInterfaceStateTypeToString(lnk.state), - virInterfaceStateTypeToString(data->state)); + virNetDevIfStateTypeToString(lnk.state), + virNetDevIfStateTypeToString(data->state)); goto cleanup; } @@ -77,9 +77,9 @@ mymain(void) ret = -1; \ } while (0) - DO_TEST_LINK("eth0", VIR_INTERFACE_STATE_UP, 1000); - DO_TEST_LINK("lo", VIR_INTERFACE_STATE_UNKNOWN, 0); - DO_TEST_LINK("eth0-broken", VIR_INTERFACE_STATE_DOWN, 0); + DO_TEST_LINK("eth0", VIR_NETDEV_IF_STATE_UP, 1000); + DO_TEST_LINK("lo", VIR_NETDEV_IF_STATE_UNKNOWN, 0); + DO_TEST_LINK("eth0-broken", VIR_NETDEV_IF_STATE_DOWN, 0); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.5.5

I'm tired of mistyping this all the time, so let's do it the same all the time (similar to how we changed all "Pci" to "PCI" awhile back). (NB: I've left alone some things in the esx and vbox drivers because I'm unable to compile them and they weren't obviously *not* a part of some API. I also didn't change a couple of variables named, e.g. "somethingIptables", because they were derived from the name of the "iptables" command) --- src/conf/domain_conf.c | 24 +++++----- src/conf/domain_conf.h | 12 ++--- src/conf/interface_conf.c | 38 +++++++-------- src/conf/interface_conf.h | 8 ++-- src/conf/network_conf.c | 80 +++++++++++++++---------------- src/conf/network_conf.h | 20 ++++---- src/conf/networkcommon_conf.c | 6 +-- src/esx/esx_driver.c | 44 ++++++++--------- src/esx/esx_interface_driver.c | 4 +- src/esx/esx_vi.c | 4 +- src/esx/esx_vi.h | 2 +- src/libvirt_private.syms | 10 ++-- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_native.c | 4 +- src/network/bridge_driver.c | 74 ++++++++++++++-------------- src/network/bridge_driver_linux.c | 70 +++++++++++++-------------- src/nwfilter/nwfilter_ebiptables_driver.c | 24 +++++----- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/util/virsocketaddr.c | 4 +- src/util/virsocketaddr.h | 2 +- src/vbox/vbox_network.c | 8 ++-- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 4 +- 24 files changed, 225 insertions(+), 225 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8ff836c..e57655e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6104,11 +6104,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, return ret; } -static virDomainNetIpDefPtr -virDomainNetIpParseXML(xmlNodePtr node) +static virDomainNetIPDefPtr +virDomainNetIPParseXML(xmlNodePtr node) { /* Parse the prefix in every case */ - virDomainNetIpDefPtr ip = NULL, ret = NULL; + virDomainNetIPDefPtr ip = NULL, ret = NULL; char *prefixStr = NULL; unsigned int prefixValue = 0; char *familyStr = NULL; @@ -6230,7 +6230,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, if (nipnodes) { size_t i; for (i = 0; i < nipnodes; i++) { - virDomainNetIpDefPtr ip = virDomainNetIpParseXML(ipnodes[i]); + virDomainNetIPDefPtr ip = virDomainNetIPParseXML(ipnodes[i]); if (!ip) goto error; @@ -8862,12 +8862,12 @@ virDomainActualNetDefParseXML(xmlNodePtr node, int -virDomainNetAppendIpAddress(virDomainNetDefPtr def, +virDomainNetAppendIPAddress(virDomainNetDefPtr def, const char *address, int family, unsigned int prefix) { - virDomainNetIpDefPtr ipDef = NULL; + virDomainNetIPDefPtr ipDef = NULL; if (VIR_ALLOC(ipDef) < 0) return -1; @@ -8939,7 +8939,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int ret, val; size_t i; size_t nips = 0; - virDomainNetIpDefPtr *ips = NULL; + virDomainNetIPDefPtr *ips = NULL; size_t nroutes = 0; virNetworkRouteDefPtr *routes = NULL; @@ -9039,9 +9039,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, ctxt->node = tmpnode; } } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { - virDomainNetIpDefPtr ip = NULL; + virDomainNetIPDefPtr ip = NULL; - if (!(ip = virDomainNetIpParseXML(cur))) + if (!(ip = virDomainNetIPParseXML(cur))) goto error; if (VIR_APPEND_ELEMENT(ips, nips, ip) < 0) @@ -20239,7 +20239,7 @@ virDomainFSDefFormat(virBufferPtr buf, } static int -virDomainNetIpsFormat(virBufferPtr buf, virDomainNetIpDefPtr *ips, size_t nips) +virDomainNetIPsFormat(virBufferPtr buf, virDomainNetIPDefPtr *ips, size_t nips) { size_t i; @@ -20433,7 +20433,7 @@ virDomainHostdevDefFormatCaps(virBufferPtr buf, virBufferAddLit(buf, "</source>\n"); if (def->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) { - if (virDomainNetIpsFormat(buf, def->source.caps.u.net.ips, + if (virDomainNetIPsFormat(buf, def->source.caps.u.net.ips, def->source.caps.u.net.nips) < 0) return -1; if (virDomainNetRoutesFormat(buf, def->source.caps.u.net.routes, @@ -20852,7 +20852,7 @@ virDomainNetDefFormat(virBufferPtr buf, return -1; } - if (virDomainNetIpsFormat(buf, def->ips, def->nips) < 0) + if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0) return -1; if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6e81e52..8529a78 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -382,9 +382,9 @@ typedef enum { VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST } virDomainHostdevCapsType; -typedef struct _virDomainNetIpDef virDomainNetIpDef; -typedef virDomainNetIpDef *virDomainNetIpDefPtr; -struct _virDomainNetIpDef { +typedef struct _virDomainNetIPDef virDomainNetIPDef; +typedef virDomainNetIPDef *virDomainNetIPDefPtr; +struct _virDomainNetIPDef { virSocketAddr address; /* ipv4 or ipv6 address */ unsigned int prefix; /* number of 1 bits in the net mask */ }; @@ -403,7 +403,7 @@ struct _virDomainHostdevCaps { struct { char *iface; size_t nips; - virDomainNetIpDefPtr *ips; + virDomainNetIPDefPtr *ips; size_t nroutes; virNetworkRouteDefPtr *routes; } net; @@ -986,7 +986,7 @@ struct _virDomainNetDef { int trustGuestRxFilters; /* enum virTristateBool */ int linkstate; size_t nips; - virDomainNetIpDefPtr *ips; + virDomainNetIPDefPtr *ips; size_t nroutes; virNetworkRouteDefPtr *routes; }; @@ -2775,7 +2775,7 @@ virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface); bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface); -int virDomainNetAppendIpAddress(virDomainNetDefPtr def, +int virDomainNetAppendIPAddress(virDomainNetDefPtr def, const char *address, int family, unsigned int prefix); diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 26e55cc..40f1958 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -45,7 +45,7 @@ virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def, virInterfaceType parentIfType); static -void virInterfaceIpDefFree(virInterfaceIpDefPtr def) +void virInterfaceIPDefFree(virInterfaceIPDefPtr def) { if (def == NULL) return; @@ -61,7 +61,7 @@ void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) if (def == NULL) return; for (i = 0; i < def->nips; i++) - virInterfaceIpDefFree(def->ips[i]); + virInterfaceIPDefFree(def->ips[i]); VIR_FREE(def->ips); VIR_FREE(def->family); VIR_FREE(def->gateway); @@ -281,7 +281,7 @@ virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def, } static int -virInterfaceDefParseIp(virInterfaceIpDefPtr def, +virInterfaceDefParseIP(virInterfaceIPDefPtr def, xmlXPathContextPtr ctxt) { int ret = 0; @@ -310,7 +310,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, { xmlNodePtr dhcp; xmlNodePtr *ipNodes = NULL; - int nIpNodes, ret = -1; + int nIPNodes, ret = -1; size_t i; char *tmp; @@ -323,26 +323,26 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, return -1; } - nIpNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); - if (nIpNodes < 0) + nIPNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); + if (nIPNodes < 0) return -1; if (ipNodes == NULL) return 0; - if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) + if (VIR_ALLOC_N(def->ips, nIPNodes) < 0) goto error; def->nips = 0; - for (i = 0; i < nIpNodes; i++) { + for (i = 0; i < nIPNodes; i++) { - virInterfaceIpDefPtr ip; + virInterfaceIPDefPtr ip; if (VIR_ALLOC(ip) < 0) goto error; ctxt->node = ipNodes[i]; - if (virInterfaceDefParseIp(ip, ctxt) < 0) { - virInterfaceIpDefFree(ip); + if (virInterfaceDefParseIP(ip, ctxt) < 0) { + virInterfaceIPDefFree(ip); goto error; } def->ips[def->nips++] = ip; @@ -361,7 +361,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, { xmlNodePtr dhcp, autoconf; xmlNodePtr *ipNodes = NULL; - int nIpNodes, ret = -1; + int nIPNodes, ret = -1; size_t i; char *tmp; @@ -378,26 +378,26 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, return -1; } - nIpNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); - if (nIpNodes < 0) + nIPNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); + if (nIPNodes < 0) return -1; if (ipNodes == NULL) return 0; - if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) + if (VIR_ALLOC_N(def->ips, nIPNodes) < 0) goto error; def->nips = 0; - for (i = 0; i < nIpNodes; i++) { + for (i = 0; i < nIPNodes; i++) { - virInterfaceIpDefPtr ip; + virInterfaceIPDefPtr ip; if (VIR_ALLOC(ip) < 0) goto error; ctxt->node = ipNodes[i]; - if (virInterfaceDefParseIp(ip, ctxt) < 0) { - virInterfaceIpDefFree(ip); + if (virInterfaceDefParseIP(ip, ctxt) < 0) { + virInterfaceIPDefFree(ip); goto error; } def->ips[def->nips++] = ip; diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 5cabec7..2523207 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -119,9 +119,9 @@ struct _virInterfaceVlanDef { char *dev_name; /* device name for vlan */ }; -typedef struct _virInterfaceIpDef virInterfaceIpDef; -typedef virInterfaceIpDef *virInterfaceIpDefPtr; -struct _virInterfaceIpDef { +typedef struct _virInterfaceIPDef virInterfaceIPDef; +typedef virInterfaceIPDef *virInterfaceIPDefPtr; +struct _virInterfaceIPDef { char *address; /* ip address */ int prefix; /* ip prefix */ }; @@ -135,7 +135,7 @@ struct _virInterfaceProtocolDef { int peerdns; /* dhcp peerdns ? */ int autoconf; /* only useful if family is ipv6 */ int nips; - virInterfaceIpDefPtr *ips; /* ptr to array of ips[nips] */ + virInterfaceIPDefPtr *ips; /* ptr to array of ips[nips] */ char *gateway; /* route gateway */ }; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 02b8cd7..5ae2bdf 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -310,7 +310,7 @@ virNetworkDHCPHostDefClear(virNetworkDHCPHostDefPtr def) } static void -virNetworkIpDefClear(virNetworkIpDefPtr def) +virNetworkIPDefClear(virNetworkIPDefPtr def) { VIR_FREE(def->family); VIR_FREE(def->ranges); @@ -402,7 +402,7 @@ virNetworkDefFree(virNetworkDefPtr def) virNetworkForwardDefClear(&def->forward); for (i = 0; i < def->nips && def->ips; i++) - virNetworkIpDefClear(&def->ips[i]); + virNetworkIPDefClear(&def->ips[i]); VIR_FREE(def->ips); for (i = 0; i < def->nroutes && def->routes; i++) @@ -780,8 +780,8 @@ void virNetworkRemoveInactive(virNetworkObjListPtr nets, } /* return ips[index], or NULL if there aren't enough ips */ -virNetworkIpDefPtr -virNetworkDefGetIpByIndex(const virNetworkDef *def, +virNetworkIPDefPtr +virNetworkDefGetIPByIndex(const virNetworkDef *def, int family, size_t n) { size_t i; @@ -832,9 +832,9 @@ virNetworkDefGetRouteByIndex(const virNetworkDef *def, /* return number of 1 bits in netmask for the network's ipAddress, * or -1 on error */ -int virNetworkIpDefPrefix(const virNetworkIpDef *def) +int virNetworkIPDefPrefix(const virNetworkIPDef *def) { - return virSocketAddrGetIpPrefix(&def->address, + return virSocketAddrGetIPPrefix(&def->address, &def->netmask, def->prefix); } @@ -843,7 +843,7 @@ int virNetworkIpDefPrefix(const virNetworkIpDef *def) * definition, based on either the definition's netmask, or its * prefix. Return -1 on error (and set the netmask family to AF_UNSPEC) */ -int virNetworkIpDefNetmask(const virNetworkIpDef *def, +int virNetworkIPDefNetmask(const virNetworkIPDef *def, virSocketAddrPtr netmask) { if (VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { @@ -851,14 +851,14 @@ int virNetworkIpDefNetmask(const virNetworkIpDef *def, return 0; } - return virSocketAddrPrefixToNetmask(virNetworkIpDefPrefix(def), netmask, + return virSocketAddrPrefixToNetmask(virNetworkIPDefPrefix(def), netmask, VIR_SOCKET_ADDR_FAMILY(&def->address)); } static int virSocketAddrRangeParseXML(const char *networkName, - virNetworkIpDefPtr ipdef, + virNetworkIPDefPtr ipdef, xmlNodePtr node, virSocketAddrRangePtr range) { @@ -887,7 +887,7 @@ virSocketAddrRangeParseXML(const char *networkName, /* do a sanity check of the range */ if (virSocketAddrGetRange(&range->start, &range->end, &ipdef->address, - virNetworkIpDefPrefix(ipdef)) < 0) + virNetworkIPDefPrefix(ipdef)) < 0) goto cleanup; ret = 0; @@ -900,7 +900,7 @@ virSocketAddrRangeParseXML(const char *networkName, static int virNetworkDHCPHostDefParseXML(const char *networkName, - virNetworkIpDefPtr def, + virNetworkIPDefPtr def, xmlNodePtr node, virNetworkDHCPHostDefPtr host, bool partialOkay) @@ -1021,7 +1021,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, - virNetworkIpDefPtr def) + virNetworkIPDefPtr def) { int ret = -1; xmlNodePtr cur; @@ -1448,10 +1448,10 @@ static int virNetworkIPDefParseXML(const char *networkName, xmlNodePtr node, xmlXPathContextPtr ctxt, - virNetworkIpDefPtr def) + virNetworkIPDefPtr def) { /* - * virNetworkIpDef object is already allocated as part of an array. + * virNetworkIPDef object is already allocated as part of an array. * On failure clear it out, but don't free it. */ @@ -1586,7 +1586,7 @@ virNetworkIPDefParseXML(const char *networkName, cleanup: if (result < 0) - virNetworkIpDefClear(def); + virNetworkIPDefClear(def); VIR_FREE(address); VIR_FREE(netmask); @@ -2050,7 +2050,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) xmlNodePtr *ipNodes = NULL; xmlNodePtr *routeNodes = NULL; xmlNodePtr *portGroupNodes = NULL; - int nIps, nPortGroups, nRoutes; + int nips, nPortGroups, nRoutes; xmlNodePtr dnsNode = NULL; xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; @@ -2227,18 +2227,18 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } VIR_FREE(portGroupNodes); - nIps = virXPathNodeSet("./ip", ctxt, &ipNodes); - if (nIps < 0) + nips = virXPathNodeSet("./ip", ctxt, &ipNodes); + if (nips < 0) goto error; - if (nIps > 0) { + if (nips > 0) { size_t i; /* allocate array to hold all the addrs */ - if (VIR_ALLOC_N(def->ips, nIps) < 0) + if (VIR_ALLOC_N(def->ips, nips) < 0) goto error; /* parse each addr */ - for (i = 0; i < nIps; i++) { + for (i = 0; i < nips; i++) { if (virNetworkIPDefParseXML(def->name, ipNodes[i], ctxt, @@ -2278,7 +2278,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) * is directly reachable from this bridge. */ nRoutes = def->nroutes; - nIps = def->nips; + nips = def->nips; for (i = 0; i < nRoutes; i++) { size_t j; virSocketAddr testAddr, testGw; @@ -2286,13 +2286,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) virNetworkRouteDefPtr gwdef = def->routes[i]; virSocketAddrPtr gateway = virNetworkRouteDefGetGateway(gwdef); addrMatch = false; - for (j = 0; j < nIps; j++) { - virNetworkIpDefPtr def2 = &def->ips[j]; + for (j = 0; j < nips; j++) { + virNetworkIPDefPtr def2 = &def->ips[j]; if (VIR_SOCKET_ADDR_FAMILY(gateway) != VIR_SOCKET_ADDR_FAMILY(&def2->address)) { continue; } - int prefix = virNetworkIpDefPrefix(def2); + int prefix = virNetworkIPDefPrefix(def2); virSocketAddrMaskByPrefix(&def2->address, prefix, &testAddr); virSocketAddrMaskByPrefix(gateway, prefix, &testGw); if (VIR_SOCKET_ADDR_VALID(&testAddr) && @@ -2544,8 +2544,8 @@ virNetworkDNSDefFormat(virBufferPtr buf, } static int -virNetworkIpDefFormat(virBufferPtr buf, - const virNetworkIpDef *def) +virNetworkIPDefFormat(virBufferPtr buf, + const virNetworkIPDef *def) { int result = -1; @@ -2871,7 +2871,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, goto error; for (i = 0; i < def->nips; i++) { - if (virNetworkIpDefFormat(buf, &def->ips[i]) < 0) + if (virNetworkIPDefFormat(buf, &def->ips[i]) < 0) goto error; } @@ -3467,15 +3467,15 @@ virNetworkDefUpdateIP(virNetworkDefPtr def, return -1; } -static virNetworkIpDefPtr -virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) +static virNetworkIPDefPtr +virNetworkIPDefByIndex(virNetworkDefPtr def, int parentIndex) { - virNetworkIpDefPtr ipdef = NULL; + virNetworkIPDefPtr ipdef = NULL; size_t i; /* first find which ip element's dhcp host list to work on */ if (parentIndex >= 0) { - ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, parentIndex); + ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, parentIndex); if (!(ipdef)) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't update dhcp host entry - no <ip> " @@ -3489,15 +3489,15 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) * means the one and only <ip> that has <dhcp> element */ for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { if (ipdef->nranges || ipdef->nhosts) break; } if (!ipdef) { - ipdef = virNetworkDefGetIpByIndex(def, AF_INET, 0); + ipdef = virNetworkDefGetIPByIndex(def, AF_INET, 0); if (!ipdef) - ipdef = virNetworkDefGetIpByIndex(def, AF_INET6, 0); + ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, 0); } if (!ipdef) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -3510,13 +3510,13 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) static int virNetworkDefUpdateCheckMultiDHCP(virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { int family = VIR_SOCKET_ADDR_FAMILY(&ipdef->address); size_t i; - virNetworkIpDefPtr ip; + virNetworkIPDefPtr ip; - for (i = 0; (ip = virNetworkDefGetIpByIndex(def, family, i)); i++) { + for (i = 0; (ip = virNetworkDefGetIPByIndex(def, family, i)); i++) { if (ip != ipdef) { if (ip->nranges || ip->nhosts) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -3541,7 +3541,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, { size_t i; int ret = -1; - virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); + virNetworkIPDefPtr ipdef = virNetworkIPDefByIndex(def, parentIndex); virNetworkDHCPHostDef host; bool partialOkay = (command == VIR_NETWORK_UPDATE_COMMAND_DELETE); @@ -3680,7 +3680,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, { size_t i; int ret = -1; - virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); + virNetworkIPDefPtr ipdef = virNetworkIPDefByIndex(def, parentIndex); virSocketAddrRange range; memset(&range, 0, sizeof(range)); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 0d34dfe..18f4d1e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -1,7 +1,7 @@ /* * network_conf.h: network XML handling * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2016 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -138,15 +138,15 @@ struct _virNetworkDNSDef { char **forwarders; }; -typedef struct _virNetworkIpDef virNetworkIpDef; -typedef virNetworkIpDef *virNetworkIpDefPtr; -struct _virNetworkIpDef { +typedef struct _virNetworkIPDef virNetworkIPDef; +typedef virNetworkIPDef *virNetworkIPDefPtr; +struct _virNetworkIPDef { char *family; /* ipv4 or ipv6 - default is ipv4 */ virSocketAddr address; /* Bridge IP address */ /* One or the other of the following two will be used for a given * IP address, but never both. The parser guarantees this. - * Use virNetworkIpDefPrefix/virNetworkIpDefNetmask rather + * Use virNetworkIPDefPrefix/virNetworkIPDefNetmask rather * than accessing the data directly - these utility functions * will convert one into the other as necessary. */ @@ -240,7 +240,7 @@ struct _virNetworkDef { virNetworkForwardDef forward; size_t nips; - virNetworkIpDefPtr ips; /* ptr to array of IP addresses on this network */ + virNetworkIPDefPtr ips; /* ptr to array of IP addresses on this network */ size_t nroutes; virNetworkRouteDefPtr *routes; /* ptr to array of static routes on this interface */ @@ -351,14 +351,14 @@ const char * virNetworkDefForwardIf(const virNetworkDef *def, size_t n); virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, const char *portgroup); -virNetworkIpDefPtr -virNetworkDefGetIpByIndex(const virNetworkDef *def, +virNetworkIPDefPtr +virNetworkDefGetIPByIndex(const virNetworkDef *def, int family, size_t n); virNetworkRouteDefPtr virNetworkDefGetRouteByIndex(const virNetworkDef *def, int family, size_t n); -int virNetworkIpDefPrefix(const virNetworkIpDef *def); -int virNetworkIpDefNetmask(const virNetworkIpDef *def, +int virNetworkIPDefPrefix(const virNetworkIPDef *def); +int virNetworkIPDefNetmask(const virNetworkIPDef *def, virSocketAddrPtr netmask); int virNetworkSaveXML(const char *configDir, diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 7b7a851..8f9d4b8 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -38,7 +38,7 @@ struct _virNetworkRouteDef { /* One or the other of the following two will be used for a given * Network address, but never both. The parser guarantees this. - * The virSocketAddrGetIpPrefix() can be used to get a + * The virSocketAddrGetIPPrefix() can be used to get a * valid prefix. */ virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ @@ -387,10 +387,10 @@ virNetworkRouteDefGetPrefix(virNetworkRouteDefPtr def) virSocketAddrEqual(&def->netmask, &zero))) prefix = 0; else - prefix = virSocketAddrGetIpPrefix(&def->address, &def->netmask, + prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, def->prefix); } else { - prefix = virSocketAddrGetIpPrefix(&def->address, &def->netmask, + prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, def->prefix); } diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 60fcac0..eae015a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -612,7 +612,7 @@ static int esxConnectToHost(esxPrivate *priv, virConnectPtr conn, virConnectAuthPtr auth, - char **vCenterIpAddress) + char **vCenterIPAddress) { int result = -1; char ipAddress[NI_MAXHOST] = ""; @@ -626,7 +626,7 @@ esxConnectToHost(esxPrivate *priv, ? esxVI_ProductLine_ESX : esxVI_ProductLine_GSX; - if (!vCenterIpAddress || *vCenterIpAddress) { + if (!vCenterIPAddress || *vCenterIPAddress) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -683,7 +683,7 @@ esxConnectToHost(esxPrivate *priv, &inMaintenanceMode, esxVI_Occurrence_RequiredItem) < 0 || esxVI_GetStringValue(hostSystem, "summary.managementServerIp", - vCenterIpAddress, + vCenterIPAddress, esxVI_Occurrence_OptionalItem) < 0) { goto cleanup; } @@ -692,7 +692,7 @@ esxConnectToHost(esxPrivate *priv, if (inMaintenanceMode == esxVI_Boolean_True) VIR_WARN("The server is in maintenance mode"); - if (VIR_STRDUP(*vCenterIpAddress, *vCenterIpAddress) < 0) + if (VIR_STRDUP(*vCenterIPAddress, *vCenterIPAddress) < 0) goto cleanup; result = 0; @@ -714,7 +714,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectPtr conn, virConnectAuthPtr auth, const char *hostname, - const char *hostSystemIpAddress) + const char *hostSystemIPAddress) { int result = -1; char ipAddress[NI_MAXHOST] = ""; @@ -722,7 +722,7 @@ esxConnectToVCenter(esxPrivate *priv, char *password = NULL; char *url = NULL; - if (!hostSystemIpAddress && + if (!hostSystemIPAddress && (!priv->parsedUri->path || STREQ(priv->parsedUri->path, "/"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Path has to specify the datacenter and compute resource")); @@ -770,9 +770,9 @@ esxConnectToVCenter(esxPrivate *priv, goto cleanup; } - if (hostSystemIpAddress) { + if (hostSystemIPAddress) { if (esxVI_Context_LookupManagedObjectsByHostSystemIp - (priv->vCenter, hostSystemIpAddress) < 0) { + (priv->vCenter, hostSystemIPAddress) < 0) { goto cleanup; } } else { @@ -847,8 +847,8 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; char *plus; esxPrivate *priv = NULL; - char *potentialVCenterIpAddress = NULL; - char vCenterIpAddress[NI_MAXHOST] = ""; + char *potentialVCenterIPAddress = NULL; + char vCenterIPAddress[NI_MAXHOST] = ""; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -939,46 +939,46 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, STRCASEEQ(conn->uri->scheme, "gsx")) { /* Connect to host */ if (esxConnectToHost(priv, conn, auth, - &potentialVCenterIpAddress) < 0) { + &potentialVCenterIPAddress) < 0) { goto cleanup; } /* Connect to vCenter */ if (priv->parsedUri->vCenter) { if (STREQ(priv->parsedUri->vCenter, "*")) { - if (!potentialVCenterIpAddress) { + if (!potentialVCenterIPAddress) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("This host is not managed by a vCenter")); goto cleanup; } - if (!virStrcpyStatic(vCenterIpAddress, - potentialVCenterIpAddress)) { + if (!virStrcpyStatic(vCenterIPAddress, + potentialVCenterIPAddress)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("vCenter IP address %s too big for destination"), - potentialVCenterIpAddress); + potentialVCenterIPAddress); goto cleanup; } } else { if (esxUtil_ResolveHostname(priv->parsedUri->vCenter, - vCenterIpAddress, NI_MAXHOST) < 0) { + vCenterIPAddress, NI_MAXHOST) < 0) { goto cleanup; } - if (potentialVCenterIpAddress && - STRNEQ(vCenterIpAddress, potentialVCenterIpAddress)) { + if (potentialVCenterIPAddress && + STRNEQ(vCenterIPAddress, potentialVCenterIPAddress)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("This host is managed by a vCenter with IP " "address %s, but a mismachting vCenter '%s' " "(%s) has been specified"), - potentialVCenterIpAddress, priv->parsedUri->vCenter, - vCenterIpAddress); + potentialVCenterIPAddress, priv->parsedUri->vCenter, + vCenterIPAddress); goto cleanup; } } if (esxConnectToVCenter(priv, conn, auth, - vCenterIpAddress, + vCenterIPAddress, priv->host->ipAddress) < 0) { goto cleanup; } @@ -1011,7 +1011,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, cleanup: esxFreePrivate(&priv); - VIR_FREE(potentialVCenterIpAddress); + VIR_FREE(potentialVCenterIPAddress); return result; } diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 58096e8..e3b4116 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -181,8 +181,8 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virInterfaceProtocolDefPtr protocols; virInterfaceProtocolDef protocol; virSocketAddr socketAddress; - virInterfaceIpDefPtr ips; - virInterfaceIpDef ip; + virInterfaceIPDefPtr ips; + virInterfaceIPDef ip; virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bbf3721..a28ac7b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1367,13 +1367,13 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) int esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, - const char *hostSystemIpAddress) + const char *hostSystemIPAddress) { int result = -1; esxVI_ManagedObjectReference *managedObjectReference = NULL; /* Lookup HostSystem */ - if (esxVI_FindByIp(ctx, NULL, hostSystemIpAddress, esxVI_Boolean_False, + if (esxVI_FindByIp(ctx, NULL, hostSystemIPAddress, esxVI_Boolean_False, &managedObjectReference) < 0 || esxVI_LookupHostSystem(ctx, NULL, managedObjectReference, NULL, &ctx->hostSystem, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index c41541e..7c53f37 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -220,7 +220,7 @@ int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, int esxVI_Context_LookupManagedObjects(esxVI_Context *ctx); int esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path); int esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, - const char *hostSystemIpAddress); + const char *hostSystemIPAddress); int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, const char *request, esxVI_Response **response, esxVI_Occurrence occurrence); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index df2dfc3..36e3901 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -371,7 +371,7 @@ virDomainMemoryFindByDef; virDomainMemoryFindInactiveByDef; virDomainMemoryInsert; virDomainMemoryRemove; -virDomainNetAppendIpAddress; +virDomainNetAppendIPAddress; virDomainNetDefFormat; virDomainNetDefFree; virDomainNetFind; @@ -597,7 +597,7 @@ virNetworkDefFormat; virNetworkDefFormatBuf; virNetworkDefForwardIf; virNetworkDefFree; -virNetworkDefGetIpByIndex; +virNetworkDefGetIPByIndex; virNetworkDefGetRouteByIndex; virNetworkDefParseFile; virNetworkDefParseNode; @@ -605,8 +605,8 @@ virNetworkDefParseString; virNetworkDefUpdateSection; virNetworkDeleteConfig; virNetworkForwardTypeToString; -virNetworkIpDefNetmask; -virNetworkIpDefPrefix; +virNetworkIPDefNetmask; +virNetworkIPDefPrefix; virNetworkLoadAllConfigs; virNetworkLoadAllState; virNetworkObjAssignDef; @@ -2245,7 +2245,7 @@ virSocketAddrCheckNetmask; virSocketAddrEqual; virSocketAddrFormat; virSocketAddrFormatFull; -virSocketAddrGetIpPrefix; +virSocketAddrGetIPPrefix; virSocketAddrGetPort; virSocketAddrGetRange; virSocketAddrIsNetmask; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 33dcfec..531bbd5 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -513,7 +513,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, goto error_out; for (j = 0; j < netDef->nips; j++) { - virDomainNetIpDefPtr ip = netDef->ips[j]; + virDomainNetIPDefPtr ip = netDef->ips[j]; unsigned int prefix = (ip->prefix > 0) ? ip->prefix : VIR_SOCKET_ADDR_DEFAULT_PREFIX; char *ipStr = virSocketAddrFormat(&ip->address); diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 7f8e904..9ad1b08 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -419,7 +419,7 @@ typedef struct { char *macvlanmode; char *vlanid; char *name; - virDomainNetIpDefPtr *ips; + virDomainNetIPDefPtr *ips; size_t nips; char *gateway_ipv4; char *gateway_ipv6; @@ -601,7 +601,7 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) STREQ(name, "lxc.network.ipv6")) { int family = AF_INET; char **ipparts = NULL; - virDomainNetIpDefPtr ip = NULL; + virDomainNetIPDefPtr ip = NULL; if (VIR_ALLOC(ip) < 0) return -1; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7c8d2cc..130b77d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -872,7 +872,7 @@ networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName) static int networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { size_t i; bool ipv6 = false; @@ -923,7 +923,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, int nbleases = 0; size_t i; virNetworkDNSDefPtr dns = &network->def->dns; - virNetworkIpDefPtr tmpipdef, ipdef, ipv4def, ipv6def; + virNetworkIPDefPtr tmpipdef, ipdef, ipv4def, ipv6def; bool ipv6SLAAC; char *saddr = NULL, *eaddr = NULL; @@ -1013,7 +1013,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, * So listen on all defined IPv[46] addresses */ for (i = 0; - (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + (tmpipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i)); i++) { char *ipaddr = virSocketAddrFormat(&tmpipdef->address); @@ -1123,7 +1123,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, /* Find the first dhcp for both IPv4 and IPv6 */ for (i = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i)); i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -1181,7 +1181,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, while (ipdef) { int prefix; - prefix = virNetworkIpDefPrefix(ipdef); + prefix = virNetworkIPDefPrefix(ipdef); if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge '%s' has an invalid prefix"), @@ -1206,7 +1206,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start, &ipdef->ranges[r].end, &ipdef->address, - virNetworkIpDefPrefix(ipdef)); + virNetworkIPDefPrefix(ipdef)); if (thisRange < 0) goto cleanup; nbleases += thisRange; @@ -1287,7 +1287,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAddLit(&configbuf, "enable-ra\n"); } else { for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i)); i++) { if (!(ipdef->nranges || ipdef->nhosts)) { char *bridgeaddr = virSocketAddrFormat(&ipdef->address); @@ -1380,7 +1380,7 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver, int ret = -1; dnsmasqContext *dctx = NULL; - if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) { + if (!virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, 0)) { /* no IP addresses, so we don't need to run */ ret = 0; goto cleanup; @@ -1457,11 +1457,11 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver, { int ret = -1; size_t i; - virNetworkIpDefPtr ipdef, ipv4def, ipv6def; + virNetworkIPDefPtr ipdef, ipv4def, ipv6def; dnsmasqContext *dctx = NULL; /* if no IP addresses specified, nothing to do */ - if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) + if (!virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, 0)) return 0; /* if there's no running dnsmasq, just start it */ @@ -1480,7 +1480,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver, */ ipv4def = NULL; for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i)); i++) { if (!ipv4def && (ipdef->nranges || ipdef->nhosts)) ipv4def = ipdef; @@ -1488,7 +1488,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver, ipv6def = NULL; for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i)); i++) { if (!ipv6def && (ipdef->nranges || ipdef->nhosts)) ipv6def = ipdef; @@ -1545,14 +1545,14 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr) virBuffer configbuf = VIR_BUFFER_INITIALIZER; int ret = -1; size_t i; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; bool v6present = false, dhcp6 = false; *configstr = NULL; /* Check if DHCPv6 is needed */ for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i)); i++) { v6present = true; if (ipdef->nranges || ipdef->nhosts) { @@ -1582,12 +1582,12 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr) /* add a section for each IPv6 address in the config */ for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i)); i++) { int prefix; char *netaddr; - prefix = virNetworkIpDefPrefix(ipdef); + prefix = virNetworkIPDefPrefix(ipdef); if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge '%s' has an invalid prefix"), @@ -1677,7 +1677,7 @@ networkStartRadvd(virNetworkDriverStatePtr driver, goto cleanup; } - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { + if (!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0)) { /* no IPv6 addresses, so we don't need to run radvd */ ret = 0; goto cleanup; @@ -1775,7 +1775,7 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver, if (network->radvdPid <= 0 || (kill(network->radvdPid, 0) < 0)) return networkStartRadvd(driver, network); - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { + if (!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0)) { /* no IPv6 addresses, so we don't need to run radvd */ return 0; } @@ -1882,7 +1882,7 @@ networkReloadFirewallRules(virNetworkDriverStatePtr driver) /* Enable IP Forwarding. Return 0 for success, -1 for failure. */ static int -networkEnableIpForwarding(bool enableIPv4, bool enableIPv6) +networkEnableIPForwarding(bool enableIPv4, bool enableIPv6) { int ret = 0; #ifdef HAVE_SYSCTLBYNAME @@ -1909,7 +1909,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr network) { char *field = NULL; int ret = -1; - bool enableIPv6 = !!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0); + bool enableIPv6 = !!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0); /* set disable_ipv6 if there are no ipv6 addresses defined for the * network. But also unset it if there *are* ipv6 addresses, as we @@ -1975,9 +1975,9 @@ networkSetIPv6Sysctls(virNetworkObjPtr network) /* add an IP address to a bridge */ static int networkAddAddrToBridge(virNetworkObjPtr network, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { - int prefix = virNetworkIpDefPrefix(ipdef); + int prefix = virNetworkIPDefPrefix(ipdef); if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2044,14 +2044,14 @@ networkAddRouteToBridge(virNetworkObjPtr network, static int networkWaitDadFinish(virNetworkObjPtr network) { - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virSocketAddrPtr *addrs = NULL, addr = NULL; size_t naddrs = 0; int ret = -1; VIR_DEBUG("Begin waiting for IPv6 DAD on network %s", network->def->name); - while ((ipdef = virNetworkDefGetIpByIndex(network->def, + while ((ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, naddrs))) { addr = &ipdef->address; if (VIR_APPEND_ELEMENT_COPY(addrs, naddrs, addr) < 0) @@ -2074,7 +2074,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, size_t i; bool v4present = false, v6present = false; virErrorPtr save_err = NULL; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virNetworkRouteDefPtr routedef; char *macTapIfName = NULL; int tapfd = -1; @@ -2147,7 +2147,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, goto err1; for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i)); i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) v4present = true; @@ -2185,7 +2185,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, /* If forward.type != NONE, turn on global IP forwarding */ if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && - networkEnableIpForwarding(v4present, v6present) < 0) { + networkEnableIPForwarding(v4present, v6present) < 0) { virReportSystemError(errno, "%s", _("failed to enable IP forwarding")); goto err3; @@ -2917,7 +2917,7 @@ networkValidate(virNetworkDriverStatePtr driver, size_t i, j; bool vlanUsed, vlanAllowed, badVlanUse = false; virPortGroupDefPtr defaultPortGroup = NULL; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; bool ipv4def = false, ipv6def = false; bool bandwidthAllowed = true; bool usesInterface = false, usesAddress = false; @@ -2949,7 +2949,7 @@ networkValidate(virNetworkDriverStatePtr driver, virNetworkForwardTypeToString(def->forward.type)); return -1; } - if (virNetworkDefGetIpByIndex(def, AF_UNSPEC, 0)) { + if (virNetworkDefGetIPByIndex(def, AF_UNSPEC, 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported <ip> element in network %s " "with forward mode='%s'"), @@ -3022,7 +3022,7 @@ networkValidate(virNetworkDriverStatePtr driver, * on one IPv6 address per defined network */ for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -3313,7 +3313,7 @@ networkUpdate(virNetworkPtr net, virNetworkObjPtr network = NULL; int isActive, ret = -1; size_t i; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; bool oldDhcpActive = false; bool needFirewallRefresh = false; @@ -3330,7 +3330,7 @@ networkUpdate(virNetworkPtr net, /* see if we are listening for dhcp pre-modification */ for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i)); i++) { if (ipdef->nranges || ipdef->nhosts) { oldDhcpActive = true; @@ -3425,7 +3425,7 @@ networkUpdate(virNetworkPtr net, bool newDhcpActive = false; for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i)); i++) { if (ipdef->nranges || ipdef->nhosts) { newDhcpActive = true; @@ -3694,7 +3694,7 @@ networkGetDHCPLeases(virNetworkPtr network, const char *mac_tmp = NULL; virJSONValuePtr lease_tmp = NULL; virJSONValuePtr leases_array = NULL; - virNetworkIpDefPtr ipdef_tmp = NULL; + virNetworkIPDefPtr ipdef_tmp = NULL; virNetworkDHCPLeasePtr lease = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL; virNetworkObjPtr obj; @@ -3801,7 +3801,7 @@ networkGetDHCPLeases(virNetworkPtr network, } if (!ipv6 && VIR_SOCKET_ADDR_IS_FAMILY(&ipdef_tmp->address, AF_INET)) { - lease->prefix = virSocketAddrGetIpPrefix(&ipdef_tmp->address, + lease->prefix = virSocketAddrGetIPPrefix(&ipdef_tmp->address, &ipdef_tmp->netmask, ipdef_tmp->prefix); break; @@ -4717,7 +4717,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) int ret = -1; virNetworkObjPtr network; virNetworkDefPtr netdef; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virSocketAddr addr; virSocketAddrPtr addrptr = NULL; char *dev_name = NULL; @@ -4736,7 +4736,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: - ipdef = virNetworkDefGetIpByIndex(netdef, AF_UNSPEC, 0); + ipdef = virNetworkDefGetIPByIndex(netdef, AF_UNSPEC, 0); if (!ipdef) { virReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' doesn't have an IP address"), diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index bd7508c..b41a1ba 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -68,7 +68,7 @@ int networkCheckRouteCollision(virNetworkDefPtr def) while (cur) { char iface[17], dest[128], mask[128]; unsigned int addr_val, mask_val; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virNetworkRouteDefPtr routedef; int num; size_t i; @@ -100,13 +100,13 @@ int networkCheckRouteCollision(virNetworkDefPtr def) addr_val &= mask_val; for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_INET, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { unsigned int net_dest; virSocketAddr netmask; - if (virNetworkIpDefNetmask(ipdef, &netmask) < 0) { + if (virNetworkIPDefNetmask(ipdef, &netmask) < 0) { VIR_WARN("Failed to get netmask of '%s'", def->bridge); continue; @@ -165,9 +165,9 @@ static const char networkLocalBroadcast[] = "255.255.255.255/32"; static int networkAddMasqueradingFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { - int prefix = virNetworkIpDefPrefix(ipdef); + int prefix = virNetworkIPDefPrefix(ipdef); const char *forwardIf = virNetworkDefForwardIf(def, 0); if (prefix < 0) { @@ -279,9 +279,9 @@ networkAddMasqueradingFirewallRules(virFirewallPtr fw, static int networkRemoveMasqueradingFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { - int prefix = virNetworkIpDefPrefix(ipdef); + int prefix = virNetworkIPDefPrefix(ipdef); const char *forwardIf = virNetworkDefForwardIf(def, 0); if (prefix < 0) @@ -349,9 +349,9 @@ networkRemoveMasqueradingFirewallRules(virFirewallPtr fw, static int networkAddRoutingFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { - int prefix = virNetworkIpDefPrefix(ipdef); + int prefix = virNetworkIPDefPrefix(ipdef); const char *forwardIf = virNetworkDefForwardIf(def, 0); if (prefix < 0) { @@ -384,9 +384,9 @@ networkAddRoutingFirewallRules(virFirewallPtr fw, static int networkRemoveRoutingFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { - int prefix = virNetworkIpDefPrefix(ipdef); + int prefix = virNetworkIPDefPrefix(ipdef); const char *forwardIf = virNetworkDefForwardIf(def, 0); if (prefix < 0) @@ -415,12 +415,12 @@ networkAddGeneralIPv4FirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipv4def; + virNetworkIPDefPtr ipv4def; /* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* We support dhcp config on 1 IPv4 interface only. */ for (i = 0; - (ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); + (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) break; @@ -452,10 +452,10 @@ networkRemoveGeneralIPv4FirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipv4def; + virNetworkIPDefPtr ipv4def; for (i = 0; - (ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); + (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) break; @@ -487,7 +487,7 @@ networkAddGeneralIPv6FirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { - if (!virNetworkDefGetIpByIndex(def, AF_INET6, 0) && + if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) && !def->ipv6nogw) { return; } @@ -499,7 +499,7 @@ networkAddGeneralIPv6FirewallRules(virFirewallPtr fw, /* Allow traffic between guests on the same bridge */ iptablesAddForwardAllowCross(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge); - if (virNetworkDefGetIpByIndex(def, AF_INET6, 0)) { + if (virNetworkDefGetIPByIndex(def, AF_INET6, 0)) { /* allow DNS over IPv6 */ iptablesAddTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesAddUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); @@ -511,12 +511,12 @@ static void networkRemoveGeneralIPv6FirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { - if (!virNetworkDefGetIpByIndex(def, AF_INET6, 0) && + if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) && !def->ipv6nogw) { return; } - if (virNetworkDefGetIpByIndex(def, AF_INET6, 0)) { + if (virNetworkDefGetIPByIndex(def, AF_INET6, 0)) { iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 547); iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesRemoveTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); @@ -553,12 +553,12 @@ networkAddChecksumFirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipv4def; + virNetworkIPDefPtr ipv4def; /* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* We support dhcp config on 1 IPv4 interface only. */ for (i = 0; - (ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); + (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { if (ipv4def->nranges || ipv4def->nhosts) break; @@ -579,12 +579,12 @@ networkRemoveChecksumFirewallRules(virFirewallPtr fw, virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipv4def; + virNetworkIPDefPtr ipv4def; /* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* We support dhcp config on 1 IPv4 interface only. */ for (i = 0; - (ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); + (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i)); i++) { if (ipv4def->nranges || ipv4def->nhosts) break; @@ -596,9 +596,9 @@ networkRemoveChecksumFirewallRules(virFirewallPtr fw, static int -networkAddIpSpecificFirewallRules(virFirewallPtr fw, +networkAddIPSpecificFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { /* NB: in the case of IPv6, routing rules are added when the * forward mode is NAT. This is because IPv6 has no NAT. @@ -617,9 +617,9 @@ networkAddIpSpecificFirewallRules(virFirewallPtr fw, static int -networkRemoveIpSpecificFirewallRules(virFirewallPtr fw, +networkRemoveIPSpecificFirewallRules(virFirewallPtr fw, virNetworkDefPtr def, - virNetworkIpDefPtr ipdef) + virNetworkIPDefPtr ipdef) { if (def->forward.type == VIR_NETWORK_FORWARD_NAT) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) @@ -637,7 +637,7 @@ networkRemoveIpSpecificFirewallRules(virFirewallPtr fw, int networkAddFirewallRules(virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virFirewallPtr fw = NULL; int ret = -1; @@ -648,18 +648,18 @@ int networkAddFirewallRules(virNetworkDefPtr def) networkAddGeneralFirewallRules(fw, def); for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { - if (networkAddIpSpecificFirewallRules(fw, def, ipdef) < 0) + if (networkAddIPSpecificFirewallRules(fw, def, ipdef) < 0) goto cleanup; } virFirewallStartRollback(fw, 0); for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { - if (networkRemoveIpSpecificFirewallRules(fw, def, ipdef) < 0) + if (networkRemoveIPSpecificFirewallRules(fw, def, ipdef) < 0) goto cleanup; } networkRemoveGeneralFirewallRules(fw, def); @@ -680,7 +680,7 @@ int networkAddFirewallRules(virNetworkDefPtr def) void networkRemoveFirewallRules(virNetworkDefPtr def) { size_t i; - virNetworkIpDefPtr ipdef; + virNetworkIPDefPtr ipdef; virFirewallPtr fw = NULL; fw = virFirewallNew(); @@ -691,9 +691,9 @@ void networkRemoveFirewallRules(virNetworkDefPtr def) virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); for (i = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); i++) { - if (networkRemoveIpSpecificFirewallRules(fw, def, ipdef) < 0) + if (networkRemoveIPSpecificFirewallRules(fw, def, ipdef) < 0) goto cleanup; } networkRemoveGeneralFirewallRules(fw, def); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index b7be291..0ab7c08 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -820,7 +820,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, static int -iptablesHandleIpHdr(virFirewallPtr fw, +iptablesHandleIPHdr(virFirewallPtr fw, virFirewallRulePtr fwrule, virNWFilterVarCombIterPtr vars, ipHdrDataDefPtr ipHdr, @@ -972,7 +972,7 @@ iptablesHandleIpHdr(virFirewallPtr fw, static int -iptablesHandleIpHdrAfterStateMatch(virFirewallPtr fw, +iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, virFirewallRulePtr fwrule, virNWFilterVarCombIterPtr vars, ipHdrDataDefPtr ipHdr, @@ -1200,7 +1200,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.tcpHdrFilter.ipHdr, directionIn, @@ -1259,7 +1259,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpHdrFilter.ipHdr, directionIn, @@ -1289,7 +1289,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpliteHdrFilter.ipHdr, directionIn, @@ -1314,7 +1314,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.espHdrFilter.ipHdr, directionIn, @@ -1339,7 +1339,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.ahHdrFilter.ipHdr, directionIn, @@ -1364,7 +1364,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.sctpHdrFilter.ipHdr, directionIn, @@ -1400,7 +1400,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.icmpHdrFilter.ipHdr, directionIn, @@ -1461,7 +1461,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.igmpHdrFilter.ipHdr, directionIn, @@ -1486,7 +1486,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &srcMacSkipped) < 0) goto cleanup; - if (iptablesHandleIpHdr(fw, fwrule, + if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.allHdrFilter.ipHdr, directionIn, @@ -1534,7 +1534,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, directionIn, rule); - if (iptablesHandleIpHdrAfterStateMatch(fw, fwrule, + if (iptablesHandleIPHdrAfterStateMatch(fw, fwrule, vars, &rule->p.allHdrFilter.ipHdr, directionIn) < 0) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 820dc22..8c77eff 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -220,7 +220,7 @@ openvzReadNetworkConf(virDomainDefPtr def, goto error; net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - if (virDomainNetAppendIpAddress(net, token, AF_UNSPEC, 0) < 0) + if (virDomainNetAppendIPAddress(net, token, AF_UNSPEC, 0) < 0) goto error; if (VIR_APPEND_ELEMENT_COPY(def->nets, def->nnets, net) < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fa05046..294a1b0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7048,7 +7048,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, char *script = net->script; char *brname = net->data.bridge.brname; size_t nips = net->nips; - virDomainNetIpDefPtr *ips = net->ips; + virDomainNetIPDefPtr *ips = net->ips; memset(net, 0, sizeof(*net)); diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 98cb4ca..12fe96a 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1011,7 +1011,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, } /** - * virSocketAddrGetIpPrefix: + * virSocketAddrGetIPPrefix: * @address: network address * @netmask: netmask for this network * @prefix: prefix if specified instead of netmask @@ -1020,7 +1020,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, */ int -virSocketAddrGetIpPrefix(const virSocketAddr *address, +virSocketAddrGetIPPrefix(const virSocketAddr *address, const virSocketAddr *netmask, int prefix) { diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index c7aaa61..990e31c 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -125,7 +125,7 @@ int virSocketAddrGetNumNetmaskBits(const virSocketAddr *netmask); int virSocketAddrPrefixToNetmask(unsigned int prefix, virSocketAddrPtr netmask, int family); -int virSocketAddrGetIpPrefix(const virSocketAddr *address, +int virSocketAddrGetIPPrefix(const virSocketAddr *address, const virSocketAddr *netmask, int prefix); bool virSocketAddrEqual(const virSocketAddr *s1, diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 4cfc365..0b944b6 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -376,7 +376,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) char *networkNameUtf8 = NULL; IHostNetworkInterface *networkInterface = NULL; virNetworkDefPtr def = virNetworkDefParseString(xml); - virNetworkIpDefPtr ipdef = NULL; + virNetworkIPDefPtr ipdef = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; vboxIIDUnion vboxnetiid; virSocketAddr netmask; @@ -402,11 +402,11 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) * If there weren't any IPv4 addresses, ignore the network (since it's * required below to have an IPv4 address) */ - ipdef = virNetworkDefGetIpByIndex(def, AF_INET, 0); + ipdef = virNetworkDefGetIPByIndex(def, AF_INET, 0); if (!ipdef) goto cleanup; - if (virNetworkIpDefNetmask(ipdef, &netmask) < 0) + if (virNetworkIPDefNetmask(ipdef, &netmask) < 0) goto cleanup; /* the current limitation of hostonly network is that you can't @@ -762,7 +762,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) { vboxGlobalData *data = network->conn->privateData; virNetworkDefPtr def = NULL; - virNetworkIpDefPtr ipdef = NULL; + virNetworkIPDefPtr ipdef = NULL; char *networkNameUtf8 = NULL; PRUnichar *networkInterfaceNameUtf16 = NULL; IHostNetworkInterface *networkInterface = NULL; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 98a22b8..2fe29fd 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -935,7 +935,7 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def, const char *vif_typename) if (bridge[0] && VIR_STRDUP(net->data.bridge.brname, bridge) < 0) goto cleanup; } - if (ip[0] && virDomainNetAppendIpAddress(net, ip, AF_INET, 0) < 0) + if (ip[0] && virDomainNetAppendIPAddress(net, ip, AF_INET, 0) < 0) goto cleanup; if (script && script[0] && diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 653b7b3..21de1a2 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -619,14 +619,14 @@ xenParseSxprNets(virDomainDefPtr def, VIR_STRDUP(net->script, tmp2) < 0) goto cleanup; tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && virDomainNetAppendIpAddress(net, tmp, AF_UNSPEC, 0) < 0) + if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0) goto cleanup; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; if (VIR_STRDUP(net->script, tmp2) < 0) goto cleanup; tmp = sexpr_node(node, "device/vif/ip"); - if (tmp && virDomainNetAppendIpAddress(net, tmp, AF_UNSPEC, 0) < 0) + if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0) goto cleanup; } -- 2.5.5

On 06/23/2016 04:25 PM, John Ferlan wrote: I agree with you (although I can't really articulate why). The nIPNodes was an oversight. I'll fix it before pushing.

On 06/22/2016 01:37 PM, Laine Stump wrote: I fear the answer to this question, but I'll ask it... Can a domain that running today with an incorrect prefixValue? If I'm reading things correct, it would have been assigned a value of 0, but could still be running. On libvirtd restart with this change could that domain 'disappear' because of this "parse" error. ACK in principle, but you may need to move that check to the "Validate" callback code path depending on how you answer the question. John

On 06/22/2016 01:37 PM, Laine Stump wrote: According to how I read the commit message, "today" it could only be possible to have a NULL netmask if prefix was set. If prefix was set, then the following code returns prefix immediately. So I don't have anything against the extra checks - perhaps a few extra words either in comments or commit regarding is something existing or something that could be a truism in the future where prefix == 0 and either netmask or address is NULL. Of course I have a feeling I'm being set up for something soon ;-) ACK - John

On 06/22/2016 01:37 PM, Laine Stump wrote: Oh and here we go call with NULL ... Coverity determines that ipStr needs to be VIR_FREE()'d here. ACK w/ the VIR_FREE() John

On 06/22/2016 01:37 PM, Laine Stump wrote: Based on 3 spots below where net->script was set to NULL, should this only be set when "(net->type == VIR_DOMAIN_NET_TYPE_BRIDGE)" ? ^^^ ^^^ ^^^ ACK - whichever way you go with that 'script' setting. I figure you know the best answer to my question John

On 06/24/2016 03:27 PM, Laine Stump wrote: derp. That's the way I'd already done it, I just forgot and didn't look carefully. So the reason I think this way is that it's a valid pointer no matter what the value of net->type (since it's set to NULL for those types that don't allow it), so it doesn't hurt anything to do it in all cases, and it could always be an advantage if some other network type starts supporting script (which is *never* going to happen).

On 06/22/2016 01:37 PM, Laine Stump wrote: I'll be impressed if someone finds your needle-in-the-haystack message in virDomainNetDefParseXML regarding openvz driver and deprecation. My only words of wisdom there are - could it cause a guest to disappear now that previously was visible? I'm all for keeping it as written here though, but there could be someone else needing some TUMS. So an empty ethernet struct is OK? If this was removed, then the RNG would need adjustment as well. I believe VIR_STRDUP does the right thing, no need for the "if ()" virStrdup() *dest = NULL; if (!src) return 0; You could move this up with the VIR_DOMAIN_NET_TYPE_USER since both just break; - your call on that. ACK in principle... Although I don't think you need that ethernet struct any more. John

On 06/24/2016 03:35 PM, Laine Stump wrote: Okay, I decided to remove it after all since I don't need it. If someone needs it in the future they can add it back. Well, except that I set guest_ifname in a different manner in the else clause of the if (net->ifname_guest), so it's really more clear if I leave it as is. ...and now I've decided to merge them all in with the other NOP cases.

On 06/22/2016 01:37 PM, Laine Stump wrote: The one naming thing that "could" have changed as well is to keep the "Def" portion (virNetDevIPRouteDefFree, virNetDevIPRouteDefParseXML, virNetDevIPRouteDefFormat, virNetDevIPRouteDefCreate). Generally I'd say it's a coin flip, but to be consistent since they're handling the virNetworkRouteDefPtr, then I guess without "knowing" the API names I'd start searching "NetworkRouteDef{Parse|Format}" in order to find the code that dealt with it (the libvirt consistency argument). Maybe they'll happen in a later patch, but why not move the Create, Parse and Format routines as well? That'd remove networkcommon_conf it seems. Could really gone for overkill and generated virnetdeviproute.{h,c} ~/~ [...] The arguments need vertical alignment on line 2 and 3 under the _... [...] Vertical alignment... [...] [...] Vertical alignment [...] [...] Vertical alignment Vertical alignment Vertical alignment Vertical alignment [...] Vertical alignment [...] ACK - I think the Def should be added back in and the vertical alignment things fixed. A quick scan from yesterday and I found just one instance in patch 2, src/conf/interface_conf.c for _virInterfaceDef and the comment column off by 1 vertical char (no big deal). John

On 06/22/2016 01:37 PM, Laine Stump wrote: Why? If it needs to be "higher" to avoid the forward reference for future callers, then so be it. static int Seeing just VIR_FREE(ip) made me go look at how it was allocated - guess I was (now) concerned that something would be allocated into ip that wasn't free'd properly (eg. no virNetDevIPFree() API ... Anyway, the ip->address is written with the result of a getaddrinfo in virSocketAddrParseInternal, which when free'd should be done by freeaddrinfo, right? I think this is existing, but fixable... at some point in time. > + virNetDevIPRouteFree(route); > + VIR_FREE(nodes); > + return ret; > +} > + > static int > virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, > xmlXPathContextPtr ctxt, > @@ -20311,6 +20363,22 @@ virDomainNetRoutesFormat(virBufferPtr buf, > return 0; > } > > + > +virDomainNetIPInfoFormat(virBufferPtr buf, > + virNetDevIPInfoPtr def); Same complaint. static int ACK with the forward ref and static int used. I think you need a "new" patch at some point in time to handle the getaddrinfo/freeaddrinfo... John

On 06/22/2016 01:37 PM, Laine Stump wrote: Coverity complains here that ipStr is overwritten (from 4 lines up - char *ipStr = virSocketAddrFormat(&ip->address);) It seems the first one is duplicitous. Hmm... Seems commit id 'a117652917e' forgot about 'em.... Note - no check if ipStr is NULL... Coverity let me know this causes ipStr to be leaked. Probably similar for peerStr too, but Coverity didn't note that one. NULLSTR() or perhaps EMPTYSTR()? For ipStr, peerStr, and bcastStr... In any case, since ipStr could be NULL it needs the similar check Similar comment regarding ipStr, peerStr, and bcastStr usage ACK with the adjustments, John

On 06/22/2016 01:37 PM, Laine Stump wrote: Saw that - was wondering, then I read the commit message. Fine by me... Funny/Ironic - this patch fixes the Coverity error I noted in the previous patch for lxcContainerRenameAndEnableInterfaces NIT: See below - for virnetipdev.h minor nit. ACK John [...] ^^ There one extraneous space here... don't forget to align the argument then too.

--- src/util/virnetdevip.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 6889f81..5daeed5 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -315,7 +315,6 @@ virNetDevIPRouteAdd(const char *ifname, /* If we have no valid network address, then use the default one */ if (!addr || !VIR_SOCKET_ADDR_VALID(addr)) { - VIR_DEBUG("computing default address"); int family = VIR_SOCKET_ADDR_FAMILY(gateway); if (family == AF_INET) { if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_ALL) < 0) @@ -328,9 +327,11 @@ virNetDevIPRouteAdd(const char *ifname, actualAddr = &defaultAddr; } - toStr = virSocketAddrFormat(actualAddr); - viaStr = virSocketAddrFormat(gateway); - VIR_DEBUG("Adding route %s/%d via %s", toStr, prefix, viaStr); + if (!(toStr = virSocketAddrFormat(actualAddr))) + goto cleanup; + if (!(viaStr = virSocketAddrFormat(gateway))) + goto cleanup; + VIR_DEBUG("Adding route to %s/%u via %s on %s", toStr, prefix, viaStr, ifname); if (virNetDevGetIPAddressBinary(actualAddr, &addrData, &addrDataLen) < 0 || virNetDevGetIPAddressBinary(gateway, &gatewayData, &addrDataLen) < 0) @@ -376,7 +377,9 @@ virNetDevIPRouteAdd(const char *ifname, goto cleanup; if ((errCode = virNetlinkGetErrorCode(resp, recvbuflen)) < 0) { - virReportSystemError(errCode, _("Error adding route to %s"), ifname); + virReportSystemError(errCode, + _("Error adding route to %s/%u via %s on %s"), + toStr, prefix, viaStr, ifname); goto cleanup; } @@ -617,7 +620,8 @@ virNetDevIPRouteAdd(const char *ifname, unsigned int metric) { virCommandPtr cmd = NULL; - char *addrstr = NULL, *gatewaystr = NULL; + char *toStr = NULL; + char *viaStr = NULL; virSocketAddr defaultAddr; virSocketAddrPtr actualAddr; int ret = -1; @@ -638,14 +642,16 @@ virNetDevIPRouteAdd(const char *ifname, actualAddr = &defaultAddr; } - if (!(addrstr = virSocketAddrFormat(actualAddr))) + if (!(toStr = virSocketAddrFormat(actualAddr))) goto cleanup; - if (!(gatewaystr = virSocketAddrFormat(gateway))) + if (!(viaStr = virSocketAddrFormat(gateway))) goto cleanup; + VIR_DEBUG("Adding route to %s/%u via %s on %s", toStr, prefix, viaStr, ifname); + cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "route", "add", NULL); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, + virCommandAddArgFormat(cmd, "%s/%u", toStr, prefix); + virCommandAddArgList(cmd, "via", viaStr, "dev", ifname, "proto", "static", "metric", NULL); virCommandAddArgFormat(cmd, "%u", metric); @@ -654,8 +660,8 @@ virNetDevIPRouteAdd(const char *ifname, ret = 0; cleanup: - VIR_FREE(addrstr); - VIR_FREE(gatewaystr); + VIR_FREE(toStr); + VIR_FREE(viaStr); virCommandFree(cmd); return ret; } -- 2.5.5

From: Vasiliy Tolstov <v.tolstov(a)selfip.ru&gt; The peer attribute is used to set the property of the same name in the interface IP info: <interface type='ethernet'> ... <ip family='ipv4' address='192.168.122.5' prefix='32' peer='192.168.122.6'/> ... </interface> Note that this element is used to set the IP information on the *guest* side interface, not the host side interface - that will be supported in an upcoming patch. (This is an updated *re*-commit of commit 690969af, which was subsequently reverted in commit 1d14b13f). Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru&gt; Signed-off-by: Laine Stump <laine(a)laine.org&gt; --- docs/formatdomain.html.in | 40 +++++++++++++++++++++++++--------------- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 +++++++++++++++- src/conf/domain_conf.h | 1 + src/util/virnetdevip.h | 5 +++-- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f660aa6..2466df7 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4967,6 +4967,7 @@ qemu-kvm -net nic,model=? /dev/null &lt;source network='default'/&gt; &lt;target dev='vnet0'/&gt; <b>&lt;ip address='192.168.122.5' prefix='24'/&gt;</b> + <b>&lt;ip address='192.168.122.5' prefix='24' peer='10.0.0.10'/&gt;</b> <b>&lt;route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/&gt;</b> <b>&lt;route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/&gt;</b> &lt;/interface&gt; @@ -4985,21 +4986,30 @@ qemu-kvm -net nic,model=? /dev/null </pre> <p> - <span class="since">Since 1.2.12</span> the network devices and host devices - with network capabilities can be provided zero or more IP addresses to set - on the target device. Note that some hypervisors or network device types - will simply ignore them or only use the first one. The <code>family</code> - attribute can be set to either <code>ipv4</code> or <code>ipv6</code>, the - <code>address</code> attribute holds the IP address. The <code>prefix</code> - is not mandatory since some hypervisors do not handle it. - </p> - - <p> - <span class="since">Since 1.2.12</span> route elements can also be added - to define the network routes to use for the network device. The attributes - of this element are described in the documentation for the <code>route</code> - element in <a href="formatnetwork.html#elementsStaticroute">network definitions</a>. - This is only used by the LXC driver. + <span class="since">Since 1.2.12</span> network devices and + hostdev devices with network capabilities can optionally be provided + one or more IP addresses to set on the network device in the + guest. Note that some hypervisors or network device types will + simply ignore them or only use the first one. + The <code>family</code> attribute can be set to + either <code>ipv4</code> or <code>ipv6</code>, and the + <code>address</code> attribute contains the IP address. The + optional <code>prefix</code> is the number of 1 bits in the + netmask, and will be automatically set if not specified - for + IPv4 the default prefix is determined according to the network + "class" (A, B, or C - see RFC870), and for IPv6 the default + prefix is 64. The optional <code>peer</code> attribute holds the + IP address of the other end of a point-to-point network + device <span class="since">(since 2.0.0)</span>. + </p> + + <p> + <span class="since">Since 1.2.12</span> route elements can also be + added to define IP routes to add in the guest. The attributes of + this element are described in the documentation for + the <code>route</code> element + in <a href="formatnetwork.html#elementsStaticroute">network + definitions</a>. This is used by the LXC driver. </p> <h5><a name="elementVhostuser">vhost-user interface</a></h5> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 563cb3c..2d12da9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2629,6 +2629,11 @@ <ref name="ipPrefix"/> </attribute> </optional> + <optional> + <attribute name="peer"> + <ref name="ipAddr"/> + </attribute> + </optional> <empty/> </element> </zeroOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index df52ac9..ad2d983 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6108,7 +6108,7 @@ virDomainNetIPParseXML(xmlNodePtr node) unsigned int prefixValue = 0; char *familyStr = NULL; int family = AF_UNSPEC; - char *address = NULL; + char *address = NULL, *peer = NULL; if (!(address = virXMLPropString(node, "address"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -6146,6 +6146,13 @@ virDomainNetIPParseXML(xmlNodePtr node) } ip->prefix = prefixValue; + if ((peer = virXMLPropString(node, "peer")) != NULL && + virSocketAddrParse(&ip->peer, peer, family) < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("Invalid peer '%s' in <ip>"), peer); + goto cleanup; + } + ret = ip; ip = NULL; @@ -6153,6 +6160,7 @@ virDomainNetIPParseXML(xmlNodePtr node) VIR_FREE(prefixStr); VIR_FREE(familyStr); VIR_FREE(address); + VIR_FREE(peer); VIR_FREE(ip); return ret; } @@ -20254,6 +20262,12 @@ virDomainNetIPInfoFormat(virBufferPtr buf, virBufferAsprintf(buf, " family='%s'", familyStr); if (def->ips[i]->prefix) virBufferAsprintf(buf, " prefix='%u'", def->ips[i]->prefix); + if (VIR_SOCKET_ADDR_VALID(&def->ips[i]->peer)) { + if (!(ipStr = virSocketAddrFormat(&def->ips[i]->peer))) + return -1; + virBufferAsprintf(buf, " peer='%s'", ipStr); + VIR_FREE(ipStr); + } virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0df5579..7ff966f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -383,6 +383,7 @@ typedef enum { VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST } virDomainHostdevCapsType; + typedef struct _virDomainHostdevCaps virDomainHostdevCaps; typedef virDomainHostdevCaps *virDomainHostdevCapsPtr; struct _virDomainHostdevCaps { diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 66c5c00..3b9b3e0 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -26,8 +26,9 @@ # include "virsocketaddr.h" typedef struct { - virSocketAddr address; /* ipv4 or ipv6 address */ - unsigned int prefix; /* number of 1 bits in the net mask */ + virSocketAddr address; /* ipv4 or ipv6 address */ + virSocketAddr peer; /* ipv4 or ipv6 address of peer */ + unsigned int prefix; /* number of 1 bits in the netmask */ } virNetDevIPAddr, *virNetDevIPAddrPtr; typedef struct { -- 2.5.5

On 06/24/2016 09:29 AM, John Ferlan wrote: Yep. We already talked about this in IRC. the virNetDevIPAddr doesn't contain the info returned from getaddrinfo. virSocketAddrParseInternal (that's who calls getaddrinfo) is called by two other functions, and both of those functions copy out the important stuff from getaddrinfo, then call freeaddrinfo. So everything is correct. You mean the extra line in domain_conf.h? :-P (since the other comment is a non-issue).

This is non-intuitively placed as a sub-element of <target>, because it will be used to configure the interface that is named in <target dev='x'/> (which is the interface on the host-side). (The already-existing configuration for the guest-side of interfaces is in subelements directly under <interface>): <interface type='ethernet'> <mac address='00:16:3e:0f:ef:8a'/> <source> <ip address='192.168.122.12' family='ipv4' prefix='24' peer='192.168.122.1'/> <ip address='192.168.122.13' family='ipv4' prefix='24'/> <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> </source> </interface> In practice, this will likely only be useful for type='ethernet', so its presence in any other type of interface is currently forbidden in the generic device Validate function (but it's been put into the general population of virDomainNetDef rather than the ethernet-specific union member so that 1) we can more easily add the capability to other types, and 2) we can retain the info when set to an invalid interface type all the way through to validation and report a proper error, rather than just ignoring it (which is currently what happens for many other type-specific settings). --- docs/formatdomain.html.in | 26 ++++++++ docs/schemas/domaincommon.rng | 3 +- src/conf/domain_conf.c | 97 ++++++++++++++++++++++------ src/conf/domain_conf.h | 3 +- tests/lxcxml2xmldata/lxc-ethernet-hostip.xml | 44 +++++++++++++ tests/lxcxml2xmltest.c | 1 + 6 files changed, 152 insertions(+), 22 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-ethernet-hostip.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2466df7..bb1c079 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5012,6 +5012,32 @@ qemu-kvm -net nic,model=? /dev/null definitions</a>. This is used by the LXC driver. </p> +<pre> + ... + &lt;devices&gt; + &lt;interface type='ethernet'&gt; + <b>&lt;source/&gt;</b> + <b>&lt;ip address='192.168.123.1' prefix='24'/&gt;</b> + <b>&lt;ip address='10.0.0.10' prefix='24' peer='192.168.122.5'/&gt;</b> + <b>&lt;route family='ipv4' address='192.168.42.0' prefix='24' gateway='192.168.123.4'/&gt;</b> + <b>&lt;source/&gt;</b> + ... + &lt;/interface&gt; + ... + &lt;/devices&gt; + ... +</pre> + + <p> + <span class="since">Since 2.0.0</span> network devices of type + "ethernet" can optionally be provided one or more IP addresses + and one or more routes to set on the <b>host</b> side of the + network device. These are configured as subelements of + the <code>&lt;source&gt;</code> element of the interface, and + have the same attributes as the similarly named elements used to + configure the guest side of the interface (described above). + </p> + <h5><a name="elementVhostuser">vhost-user interface</a></h5> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2d12da9..964ff92 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2142,7 +2142,7 @@ <interleave> <optional> <element name="source"> - <empty/> + <ref name="interface-ip-info"/> </element> </optional> <ref name="interface-options"/> @@ -2392,7 +2392,6 @@ <attribute name="dev"> <ref name="deviceName"/> </attribute> - <empty/> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ad2d983..c2e6663 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1800,6 +1800,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->ifname_guest_actual); virNetDevIPInfoClear(&def->guestIP); + virNetDevIPInfoClear(&def->hostIP); virDomainDeviceInfoClear(&def->info); VIR_FREE(def->filter); @@ -4610,6 +4611,23 @@ virDomainRedirdevDefValidate(const virDomainDef *def, static int +virDomainNetDefValidate(const virDomainNetDef *net) +{ + if ((net->hostIP.nroutes || net->hostIP.nips) && + net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid attempt to set network interface " + "host-side IP route and/or address info on " + "interface of type '%s'. This is only supported " + "on interfaces of type 'ethernet'"), + virDomainNetTypeToString(net->type)); + return -1; + } + return 0; +} + + +static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) { @@ -4620,9 +4638,11 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_REDIRDEV: return virDomainRedirdevDefValidate(def, dev->data.redirdev); + case VIR_DOMAIN_DEVICE_NET: + return virDomainNetDefValidate(dev->data.net); + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_INPUT: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: @@ -8977,6 +8997,15 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "source")) { + xmlNodePtr tmpnode = ctxt->node; + + ctxt->node = cur; + if (virDomainNetIPInfoParseXML(_("interface host IP"), + ctxt, &def->hostIP) < 0) + goto error; + ctxt->node = tmpnode; + } if (!macaddr && xmlStrEqual(cur->name, BAD_CAST "mac")) { macaddr = virXMLPropString(cur, "address"); } else if (!network && @@ -20682,6 +20711,7 @@ virDomainNetDefFormat(virBufferPtr buf, { unsigned int actualType = virDomainNetGetActualType(def); bool publicActual = false; + int sourceLines = 0; const char *typeStr; virDomainHostdevDefPtr hostdef = NULL; char macstr[VIR_MAC_STRING_BUFLEN]; @@ -20751,15 +20781,7 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.network.name); virBufferEscapeString(buf, " portgroup='%s'", def->data.network.portgroup); - virBufferAddLit(buf, "/>\n"); - - /* ONLY for internal status storage - format the ActualNetDef - * as a subelement of <interface> so that no persistent config - * data is overwritten. - */ - if ((flags & VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET) && - (virDomainActualNetDefFormat(buf, def, flags) < 0)) - return -1; + sourceLines++; break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -20773,13 +20795,16 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " mode='%s'", def->data.vhostuser->data.nix.listen ? "server" : "client"); - virBufferAddLit(buf, "/>\n"); + sourceLines++; } break; case VIR_DOMAIN_NET_TYPE_BRIDGE: - virBufferEscapeString(buf, "<source bridge='%s'/>\n", - def->data.bridge.brname); + if (def->data.bridge.brname) { + virBufferEscapeString(buf, "<source bridge='%s'", + def->data.bridge.brname); + sourceLines++; + } break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -20794,25 +20819,25 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, "<source port='%d'", def->data.socket.port); } + sourceLines++; - if (def->type != VIR_DOMAIN_NET_TYPE_UDP) { - virBufferAddLit(buf, "/>\n"); + if (def->type != VIR_DOMAIN_NET_TYPE_UDP) break; - } virBufferAddLit(buf, ">\n"); + sourceLines++; virBufferAdjustIndent(buf, 2); virBufferAsprintf(buf, "<local address='%s' port='%d'/>\n", def->data.socket.localaddr, def->data.socket.localport); virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</source>\n"); break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - virBufferEscapeString(buf, "<source name='%s'/>\n", + virBufferEscapeString(buf, "<source name='%s'", def->data.internal.name); + sourceLines++; break; case VIR_DOMAIN_NET_TYPE_DIRECT: @@ -20820,7 +20845,7 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.direct.linkdev); virBufferAsprintf(buf, " mode='%s'", virNetDevMacVLanModeTypeToString(def->data.direct.mode)); - virBufferAddLit(buf, "/>\n"); + sourceLines++; break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: @@ -20835,12 +20860,44 @@ virDomainNetDefFormat(virBufferPtr buf, break; } + /* if sourceLines == 0 - no <source> info at all so far + * sourceLines == 1 - first line writte, no terminating ">" + * sourceLines > 1 - multiple lines, including subelements + */ + if (def->hostIP.nips || def->hostIP.nroutes) { + if (sourceLines == 0) { + virBufferAddLit(buf, "<source>\n"); + sourceLines += 2; + } else if (sourceLines == 1) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + } + virBufferAdjustIndent(buf, 2); + if (virDomainNetIPInfoFormat(buf, &def->hostIP) < 0) + return -1; + virBufferAdjustIndent(buf, -2); + } + if (sourceLines == 1) + virBufferAddLit(buf, "/>\n"); + else if (sourceLines > 1) + virBufferAddLit(buf, "</source>\n"); + if (virNetDevVlanFormat(&def->vlan, buf) < 0) return -1; if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0) return -1; if (virNetDevBandwidthFormat(def->bandwidth, buf) < 0) return -1; + + /* ONLY for internal status storage - format the ActualNetDef + * as a subelement of <interface> so that no persistent config + * data is overwritten. + */ + if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK && + (flags & VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET) && + (virDomainActualNetDefFormat(buf, def, flags) < 0)) + return -1; + } if (virDomainNetIPInfoFormat(buf, &def->guestIP) < 0) @@ -20849,6 +20906,7 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<script path='%s'/>\n", def->script); virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name); + if (def->ifname && !((flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE) && (STRPREFIX(def->ifname, VIR_NET_GENERATED_PREFIX) || @@ -20856,6 +20914,7 @@ virDomainNetDefFormat(virBufferPtr buf, /* Skip auto-generated target names for inactive config. */ virBufferEscapeString(buf, "<target dev='%s'/>\n", def->ifname); } + if (def->ifname_guest || def->ifname_guest_actual) { virBufferAddLit(buf, "<guest"); /* Skip auto-generated target names for inactive config. */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7ff966f..8f6c24a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -966,7 +966,8 @@ struct _virDomainNetDef { } tune; char *script; char *domain_name; /* backend domain name */ - char *ifname; + char *ifname; /* interface name on the host (<target dev='x'/>) */ + virNetDevIPInfo hostIP; char *ifname_guest_actual; char *ifname_guest; virNetDevIPInfo guestIP; diff --git a/tests/lxcxml2xmldata/lxc-ethernet-hostip.xml b/tests/lxcxml2xmldata/lxc-ethernet-hostip.xml new file mode 100644 index 0000000..ce455f7 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-ethernet-hostip.xml @@ -0,0 +1,44 @@ +<domain type='lxc'> + <name>8675309</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <idmap> + <uid start='0' target='100000' count='100000'/> + <gid start='0' target='100000' count='100000'/> + </idmap> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/8675309'/> + <target dir='/'/> + </filesystem> + <interface type='ethernet'> + <mac address='00:16:3e:0f:ef:8a'/> + <source> + <ip address='192.168.122.12' family='ipv4' prefix='24' peer='192.168.122.1'/> + <ip address='192.168.122.13' family='ipv4' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> + </source> + <ip address='192.168.122.1' family='ipv4' prefix='32' peer='192.168.122.12'/> + <guest dev='eth2'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 1b16088..2f7f779 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -95,6 +95,7 @@ mymain(void) DO_TEST("capabilities"); DO_TEST("sharenet"); DO_TEST("ethernet"); + DO_TEST("ethernet-hostip"); DO_TEST_FULL("filesystem-root", 0, false, VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); -- 2.5.5

On 06/24/2016 09:48 AM, John Ferlan wrote: I don't think we're losing any functionality by putting it here (other than that if someone edits the config files directly on disk and then restart libvirtd they won't see an error; but then they'll be getting what they deserve). And I think its function fits better with the Validate function than with the PostParse callback (which admittedly does have some validating done in it, but that's just because the Validate callbacks are a fairly recent addition. In general, I think anything that is just validating the data in a domain as a whole should be done in the Validate callbacks, and things that modify the domain or devices should be in the postparse callbacks. Eventually pure validation should migrate, and for now at least new stuff should be added in that way. (Note that I still think that basic validation that doesn't require knowledge of any other part of the XML should still be done directly in the parse (numeric ranges, etc; basically anything that is described in the RNG). The further along I got with this, the more I came to think the same thing, but I was already up to patch 25 and too deep into this one to want to back it out and re-do in steps... The reason that extra if() was needed is that virBufferEscapeString() will emit nothing if the argument is NULL, but in our case we only want to increment sourceLines if something was printed. (This was caught by a unit test, btw). See above. I think you're just resistent to change :-P Yes. The unit tests caught problems with it initially, so they are there.

This will apply to any IP address setting that uses virNetDevIPInfoAddToDev() (which so far is only the guest-side of LXC type='ethernet' interfaces). --- src/util/virnetdevip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 5daeed5..36de9fb 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -941,7 +941,7 @@ virNetDevIPInfoAddToDev(const char *ifname, ipStr); goto cleanup; } - if (virNetDevIPAddrAdd(ifname, &ip->address, NULL, prefix) < 0) + if (virNetDevIPAddrAdd(ifname, &ip->address, &ip->peer, prefix) < 0) goto cleanup; VIR_FREE(ipStr); } -- 2.5.5

--- src/lxc/lxc_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 07eb22a..28313f0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -304,6 +304,14 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, if (virNetDevSetOnline(parentVeth, true) < 0) goto cleanup; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_ETHERNET) { + /* Set IP info for the host side, but only if the type is + * 'ethernet'. + */ + if (virNetDevIPInfoAddToDev(parentVeth, &net->hostIP) < 0) + goto cleanup; + } + if (net->filter && virDomainConfNWFilterInstantiate(vm->uuid, net) < 0) goto cleanup; -- 2.5.5

For type='ethernet' interfaces only. --- src/qemu/qemu_interface.c | 6 ++- .../qemuxml2argv-net-eth-hostip.args | 23 +++++++++++ .../qemuxml2argv-net-eth-hostip.xml | 39 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-net-eth-hostip.xml | 44 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index b48ae50..e637d21 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -196,8 +196,12 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args new file mode 100644 index 0000000..b96c933 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args @@ -0,0 +1,23 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device rtl8139,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ +-net tap,fd=3,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml new file mode 100644 index 0000000..6d08e82 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml @@ -0,0 +1,39 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='ethernet'> + <mac address='00:11:22:33:44:55'/> + <source> + <ip address='192.168.125.1' family='ipv4' prefix='24' peer='192.168.125.2'/> + <route family='ipv4' address='10.20.0.0' prefix='16' gateway='192.168.125.2'/> + </source> + <script path='/etc/qemu-ifup'/> + <model type='rtl8139'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d882f11..684093b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1011,6 +1011,7 @@ mymain(void) DO_TEST("net-eth", NONE); DO_TEST("net-eth-ifname", NONE); DO_TEST("net-eth-names", NONE); + DO_TEST("net-eth-hostip", NONE); DO_TEST("net-client", NONE); DO_TEST("net-server", NONE); DO_TEST("net-mcast", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml new file mode 100644 index 0000000..856b35b --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <interface type='ethernet'> + <mac address='00:11:22:33:44:55'/> + <source> + <ip address='192.168.125.1' family='ipv4' prefix='24' peer='192.168.125.2'/> + <route family='ipv4' address='10.20.0.0' prefix='16' gateway='192.168.125.2'/> + </source> + <script path='/etc/qemu-ifup'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7db9cb7..29a29c5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -464,6 +464,7 @@ mymain(void) DO_TEST("net-virtio-disable-offloads"); DO_TEST("net-eth"); DO_TEST("net-eth-ifname"); + DO_TEST("net-eth-hostip"); DO_TEST("net-virtio-network-portgroup"); DO_TEST("net-hostdev"); DO_TEST("net-hostdev-vfio"); -- 2.5.5