On 07/20/2011 12:21 AM, Laine Stump wrote: ACK. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

On 07/20/2011 12:21 AM, Laine Stump wrote: And in case it isn't obvious: If we ever add a new public bit in the future such that the compile-time test fails, we simply move the internal bits to another free location and recompile - since they are internal, they do not leak over RPC, so there are no cross-version dependencies and thus can be changed at will. Meanwhile, if a newer version of libvirt adds new bits and talks to an older version, the runtime check guarantees that the new bits will be rejected as unknown rather than accidentally turning on the internal behavior of the older version. ... Why the blank line between <p> and the start of the paragraph? [and I really hate it that thunderbird is back to its habits of munging quoted text in my emails again - for a while there, I was running a version where the problem went away, but the latest distro upgrade made it resurface] Add this to cfg.mk's list of free-like functions. Memory leak of def itself. This cast is not needed if you tweak domain_conf.h. Memory leak of actual on error cases. Your change and then undo made for a spurious hunk. and another one. Thinking out loud here - it looks like we never use _INTERNAL_STATUS or _INTERNAL_ACTUAL_NET in isolation - as of this patch, it is always both or neither. Maybe we could have let _INTERNAL_STATUS be the key on whether to also output/parse <actual> elements rather than adding a new flag. On the other hand, if we ever change our mind and decide that it makes sense to let the user do 'virsh dumpxml dom --actual' to see which resources actually got used, then it is easier to change VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET into a public flag, than it is if we lump all internal actions under a single _INTERNAL_STATUS flags. So no change necessary for now. Per the earlier cast comment, use int here, to match most other _virDomain*Def typed unions. A spurious whitespace change. Oops, that's a compile failure, caused by over-undoing your now-abandoned idea of adding a parameter. ACK with this squashed in: diff --git i/cfg.mk w/cfg.mk index 773a3df..f2a951d 100644 --- i/cfg.mk +++ w/cfg.mk @@ -97,6 +97,7 @@ useless_free_options = \ --name=virCommandFree \ --name=virConfFreeList \ --name=virConfFreeValue \ + --name=virDomainActualNetDefFree \ --name=virDomainChrDefFree \ --name=virDomainChrSourceDefFree \ --name=virDomainControllerDefFree \ diff --git i/src/conf/domain_conf.c w/src/conf/domain_conf.c index e6d07d1..f4a42db 100644 --- i/src/conf/domain_conf.c +++ w/src/conf/domain_conf.c @@ -752,6 +752,8 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) default: break; } + + VIR_FREE(def); } void virDomainNetDefFree(virDomainNetDefPtr def) @@ -2633,7 +2635,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, _("missing type attribute in interface's <actual> element")); goto error; } - if ((int)(actual->type = virDomainNetTypeFromString(type)) < 0) { + if ((actual->type = virDomainNetTypeFromString(type)) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unknown type '%s' in interface's <actual> element"), type); goto error; @@ -2679,6 +2681,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, error: VIR_FREE(type); VIR_FREE(mode); + virDomainActualNetDefFree(actual); ctxt->node = save_ctxt; return ret; @@ -6887,8 +6890,7 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, } ctxt->node = root; - def = virDomainDefParseXML(caps, xml, root, ctxt, expectedVirtTypes, - flags); + def = virDomainDefParseXML(caps, xml, root, ctxt, expectedVirtTypes, flags); cleanup: xmlXPathFreeContext(ctxt); @@ -6919,8 +6921,7 @@ virDomainObjParseNode(virCapsPtr caps, } ctxt->node = root; - obj = virDomainObjParseXML(caps, xml, ctxt, expectedVirtTypes, - flags); + obj = virDomainObjParseXML(caps, xml, ctxt, expectedVirtTypes, flags); cleanup: xmlXPathFreeContext(ctxt); diff --git i/src/conf/domain_conf.h w/src/conf/domain_conf.h index 9e9db41..11d27f3 100644 --- i/src/conf/domain_conf.h +++ w/src/conf/domain_conf.h @@ -351,7 +351,7 @@ enum virDomainNetVirtioTxModeType { typedef struct _virDomainActualNetDef virDomainActualNetDef; typedef virDomainActualNetDef *virDomainActualNetDefPtr; struct _virDomainActualNetDef { - enum virDomainNetType type; + int type; /* enum virDomainNetType */ union { struct { char *brname; diff --git i/src/libvirt_private.syms w/src/libvirt_private.syms index f03951f..306550b 100644 --- i/src/libvirt_private.syms +++ w/src/libvirt_private.syms @@ -743,6 +743,7 @@ virNetworkSaveConfig; virNetworkSetBridgeMacAddr; virNetworkSetBridgeName; + # node_device_conf.h virNodeDevCapTypeToString; virNodeDevCapsDefFree; diff --git i/src/libxl/libxl_driver.c w/src/libxl/libxl_driver.c index fa3f6a8..e84fa36 100644 --- i/src/libxl/libxl_driver.c +++ w/src/libxl/libxl_driver.c @@ -707,7 +707,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, } vm->def->id = domid; - if ((dom_xml = virDomainDefFormat(vm->def)) == NULL) + if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL) goto error; if (libxl_userdata_store(&priv->ctx, domid, "libvirt-xml", @@ -1852,7 +1852,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; } - if ((xml = virDomainDefFormat(vm->def)) == NULL) + if ((xml = virDomainDefFormat(vm->def, 0)) == NULL) goto cleanup; xml_len = strlen(xml) + 1; -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

The network XML is updated in the following ways: 1) The <forward> element can now contain a list of forward interfaces: <forward .... > <interface dev='eth10'/> <interface dev='eth11'/> <interface dev='eth12'/> <interface dev='eth13'/> </forward> The first of these takes the place of the dev attribute that is normally in <forward> - on when defining a network you can specify either one, and on output both will be present. If you specify both, they must match. 2) In addition to forward modes of 'nat' and 'route', these new modes are supported: private, passthrough, vepa - when this network is referenced by a domain interface, it will have the same effect as if the interface had specified, e.g.: <interface type='direct'> <source mode='${mode}' dev='${dev}> ... </interface> where ${mode} is one of the three new modes, and ${dev} is an interface selected from the list given in <forward>. bridge - if a <forward> dev (or multiple devs) is defined, and forward mode is 'bridge' this is just like the modes 'private', 'passthrough', and 'vepa' above. If there is no forward dev specified but a bridge name is given (e.g. "<bridge name='br0'/>"), then guest interfaces using this network will use libvirt's "host bridge" mode, equivalent to this: <interface type='bridge'> <source bridge='${bridge-name}'/> ... </interface> 3) A network can have multiple <portgroup> elements, which may be selected by the guest interface definition (by adding "portgroup='${name}'" in the <source> element along with the network name). Currently a portgroup can only contain a virtportprofile, but the intent is that other configuration items may be put there int the future (e.g. bandwidth config). When building a guest's interface, if the <interface> XML itself has no virtportprofile, and if the requested network has a portgroup with name matching the name given in the <interface> (or if one of the network's portgroups is marked with the "default='yes'" attribute), the virtportprofile from that portgroup will be used by the interface. 4) A network can have a virtportprofile defined at the top level, which will be used by a guest interface when connecting in one of the 'direct' modes if the guest interface XML itself hasn't specified any virtportprofile, and if there are also no matching portgroups on the network. --- Comments on other changes from V1 are here: https://www.redhat.com/archives/libvir-list/2011-July/msg01289.html https://www.redhat.com/archives/libvir-list/2011-July/msg01290.html Note that I now have text cases for both this and the domain XML changes, and documentation for the domain XML changes. I am still missing documentation for the network XML, and am working on that while you're reviewing this code. docs/schemas/network.rng | 37 +++ src/conf/network_conf.c | 334 +++++++++++++++++--- src/conf/network_conf.h | 41 +++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 85 ++++-- tests/networkxml2xmlin/8021Qbh-net.xml | 14 + tests/networkxml2xmlin/direct-net.xml | 7 + tests/networkxml2xmlin/host-bridge-net.xml | 6 + tests/networkxml2xmlin/vepa-net.xml | 22 ++ tests/networkxml2xmlout/8021Qbh-net.xml | 14 + tests/networkxml2xmlout/direct-net.xml | 7 + tests/networkxml2xmlout/host-bridge-net.xml | 6 + tests/networkxml2xmlout/nat-network-dns-hosts.xml | 4 +- .../nat-network-dns-txt-record.xml | 4 +- tests/networkxml2xmlout/nat-network.xml | 4 +- tests/networkxml2xmlout/routed-network.xml | 4 +- tests/networkxml2xmlout/vepa-net.xml | 22 ++ tests/networkxml2xmltest.c | 4 + 18 files changed, 542 insertions(+), 74 deletions(-) create mode 100644 tests/networkxml2xmlin/8021Qbh-net.xml create mode 100644 tests/networkxml2xmlin/direct-net.xml create mode 100644 tests/networkxml2xmlin/host-bridge-net.xml create mode 100644 tests/networkxml2xmlin/vepa-net.xml create mode 100644 tests/networkxml2xmlout/8021Qbh-net.xml create mode 100644 tests/networkxml2xmlout/direct-net.xml create mode 100644 tests/networkxml2xmlout/host-bridge-net.xml create mode 100644 tests/networkxml2xmlout/vepa-net.xml diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6d9f06b..1adb553 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -7,6 +7,7 @@ </start> <include href='basictypes.rng'/> + <include href='networkcommon.rng'/> <define name="network"> @@ -77,12 +78,48 @@ <choice> <value>nat</value> <value>route</value> + <value>bridge</value> + <value>passthrough</value> + <value>private</value> + <value>vepa</value> </choice> </attribute> </optional> + <zeroOrMore> + <element name='interface'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + </element> + </zeroOrMore> </element> </optional> + <!-- <virtualport> element --> + <optional> + <ref name="virtualPortProfile"/> + </optional> + + <!-- <portgroup> elements --> + <zeroOrMore> + <element name="portgroup"> + <attribute name="name"> + <ref name="deviceName"/> + </attribute> + <optional> + <attribute name="default"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> + <optional> + <ref name="virtualPortProfile"/> + </optional> + </element> + </zeroOrMore> + <!-- <domain> element --> <optional> <element name="domain"> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ae479bf..c3e7d6a 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -50,7 +50,7 @@ VIR_ENUM_DECL(virNetworkForward) VIR_ENUM_IMPL(virNetworkForward, VIR_NETWORK_FORWARD_LAST, - "none", "nat", "route" ) + "none", "nat", "route", "bridge", "private", "vepa", "passthrough" ) #define virNetworkReportError(code, ...) \ virReportErrorHelper(VIR_FROM_NETWORK, code, __FILE__, \ @@ -87,6 +87,19 @@ virNetworkObjPtr virNetworkFindByName(const virNetworkObjListPtr nets, } +static void +virPortGroupDefClear(virPortGroupDefPtr def) +{ + VIR_FREE(def->name); + VIR_FREE(def->virtPortProfile); +} + +static void +virNetworkForwardIfDefClear(virNetworkForwardIfDefPtr def) +{ + VIR_FREE(def->dev); +} + static void virNetworkIpDefClear(virNetworkIpDefPtr def) { int ii; @@ -135,14 +148,23 @@ void virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def->name); VIR_FREE(def->bridge); - VIR_FREE(def->forwardDev); VIR_FREE(def->domain); + for (ii = 0 ; ii < def->nForwardIfs && def->forwardIfs ; ii++) { + virNetworkForwardIfDefClear(&def->forwardIfs[ii]); + } + VIR_FREE(def->forwardIfs); + for (ii = 0 ; ii < def->nips && def->ips ; ii++) { virNetworkIpDefClear(&def->ips[ii]); } VIR_FREE(def->ips); + for (ii = 0; ii < def->nPortGroups && def->portGroups; ii++) { + virPortGroupDefClear(&def->portGroups[ii]); + } + VIR_FREE(def->portGroups); + virNetworkDNSDefFree(def->dns); VIR_FREE(def); @@ -735,14 +757,63 @@ error: return result; } +static int +virNetworkPortGroupParseXML(virPortGroupDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + /* + * virPortGroupDef object is already allocated as part of an array. + * On failure clear it out, but don't free it. + */ + + xmlNodePtr save; + xmlNodePtr virtPortNode; + char *isDefault = NULL; + + int result = -1; + + save = ctxt->node; + ctxt->node = node; + + /* grab raw data from XML */ + def->name = virXPathString("string(./@name)", ctxt); + isDefault = virXPathString("string(./@default)", ctxt); + def->isDefault = isDefault && STRCASEEQ(isDefault, "yes"); + + virtPortNode = virXPathNode("./virtualport", ctxt); + if (virtPortNode && + (virVirtualPortProfileParamsParseXML(virtPortNode, + &def->virtPortProfile) < 0)) { + goto error; + } + + result = 0; +error: + if (result < 0) { + virPortGroupDefClear(def); + } + VIR_FREE(isDefault); + + ctxt->node = save; + return result; +} + static virNetworkDefPtr virNetworkDefParseXML(xmlXPathContextPtr ctxt) { virNetworkDefPtr def; char *tmp; + char *stp = NULL; xmlNodePtr *ipNodes = NULL; + xmlNodePtr *portGroupNodes = NULL; + xmlNodePtr *forwardIfNodes = NULL; xmlNodePtr dnsNode = NULL; - int nIps; + xmlNodePtr virtPortNode = NULL; + xmlNodePtr forwardNode = NULL; + int nIps, nPortGroups, nForwardIfs; + char *forwardDev = NULL; + xmlNodePtr save = ctxt->node; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -779,9 +850,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) /* Parse bridge information */ def->bridge = virXPathString("string(./bridge[1]/@name)", ctxt); - tmp = virXPathString("string(./bridge[1]/@stp)", ctxt); - def->stp = (tmp && STREQ(tmp, "off")) ? 0 : 1; - VIR_FREE(tmp); + stp = virXPathString("string(./bridge[1]/@stp)", ctxt); if (virXPathULong("string(./bridge[1]/@delay)", ctxt, &def->delay) < 0) def->delay = 0; @@ -805,6 +874,36 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } + virtPortNode = virXPathNode("./virtualport", ctxt); + if (virtPortNode && + (virVirtualPortProfileParamsParseXML(virtPortNode, + &def->virtPortProfile) < 0)) { + goto error; + } + + nPortGroups = virXPathNodeSet("./portgroup", ctxt, &portGroupNodes); + if (nPortGroups < 0) + goto error; + + if (nPortGroups > 0) { + int ii; + + /* allocate array to hold all the portgroups */ + if (VIR_ALLOC_N(def->portGroups, nPortGroups) < 0) { + virReportOOMError(); + goto error; + } + /* parse each portgroup */ + for (ii = 0; ii < nPortGroups; ii++) { + int ret = virNetworkPortGroupParseXML(&def->portGroups[ii], + portGroupNodes[ii], ctxt); + if (ret < 0) + goto error; + def->nPortGroups++; + } + } + VIR_FREE(portGroupNodes); + nIps = virXPathNodeSet("./ip", ctxt, &ipNodes); if (nIps < 0) goto error; @@ -828,17 +927,16 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } VIR_FREE(ipNodes); - /* IPv4 forwarding setup */ - if (virXPathBoolean("count(./forward) > 0", ctxt)) { - if (def->nips == 0) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Forwarding requested, but no IP address provided")); - goto error; - } - tmp = virXPathString("string(./forward[1]/@mode)", ctxt); + forwardNode = virXPathNode("./forward", ctxt); + if (!forwardNode) { + def->forwardType = VIR_NETWORK_FORWARD_NONE; + def->stp = (stp && STREQ(stp, "off")) ? 0 : 1; + } else { + ctxt->node = forwardNode; + tmp = virXPathString("string(./@mode)", ctxt); if (tmp) { if ((def->forwardType = virNetworkForwardTypeFromString(tmp)) < 0) { - virNetworkReportError(VIR_ERR_INTERNAL_ERROR, + virNetworkReportError(VIR_ERR_XML_ERROR, _("unknown forwarding type '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -848,17 +946,116 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->forwardType = VIR_NETWORK_FORWARD_NAT; } + forwardDev = virXPathString("string(./@dev)", ctxt); - def->forwardDev = virXPathString("string(./forward[1]/@dev)", ctxt); - } else { - def->forwardType = VIR_NETWORK_FORWARD_NONE; - } + /* all of these modes can use a pool of physical interfaces */ + nForwardIfs = virXPathNodeSet("./interface", ctxt, &forwardIfNodes); + if (nForwardIfs < 0) + goto error; + + if ((nForwardIfs > 0) || forwardDev) { + int ii; + /* allocate array to hold all the portgroups */ + if (VIR_ALLOC_N(def->forwardIfs, MAX(nForwardIfs, 1)) < 0) { + virReportOOMError(); + goto error; + } + + if (forwardDev) { + def->forwardIfs[0].usageCount = 0; + def->forwardIfs[0].dev = forwardDev; + forwardDev = NULL; + def->nForwardIfs++; + } + + /* parse each forwardIf */ + for (ii = 0; ii < nForwardIfs; ii++) { + forwardDev = virXMLPropString(forwardIfNodes[ii], "dev"); + if (!forwardDev) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("Missing required dev attribute in network '%s' forward interface element"), + def->name); + goto error; + } + + if ((ii == 0) && (def->nForwardIfs == 1)) { + /* both forwardDev and an interface element are present. + * If they don't match, it's an error. */ + if (STRNEQ(forwardDev, def->forwardIfs[0].dev)) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("forward dev '%s' must match first interface element dev '%s' in network '%s'"), + def->forwardIfs[0].dev, + forwardDev, def->name); + goto error; + } + VIR_FREE(forwardDev); + continue; + } + + def->forwardIfs[ii].dev = forwardDev; + forwardDev = NULL; + def->forwardIfs[ii].usageCount = 0; + def->nForwardIfs++; + } + } + VIR_FREE(forwardIfNodes); + + switch (def->forwardType) { + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_NAT: + /* It's pointless to specify L3 forwarding without specifying + * the network we're on. + */ + if (def->nips == 0) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("%s forwarding requested, but no IP address provided for network '%s'"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } + if (def->nForwardIfs > 1) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("multiple forwarding interfaces specified for network '%s', only one is supported"), + def->name); + goto error; + } + def->stp = (stp && STREQ(stp, "off")) ? 0 : 1; + break; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + if (def->bridge) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("bridge name not allowed in %s mode (network '%s'"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } + /* fall through to next case */ + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->delay || stp) { + virNetworkReportError(VIR_ERR_XML_ERROR, + _("bridge delay/stp options only allowed in route, nat, and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } + break; + } + } + VIR_FREE(stp); + ctxt->node = save; return def; error: + VIR_FREE(stp); virNetworkDefFree(def); VIR_FREE(ipNodes); + VIR_FREE(portGroupNodes); + VIR_FREE(forwardIfNodes); + VIR_FREE(forwardDev); + ctxt->node = save; return NULL; } @@ -1043,6 +1240,19 @@ error: return result; } +static void +virPortGroupDefFormat(virBufferPtr buf, + const virPortGroupDefPtr def) +{ + virBufferAsprintf(buf, " <portgroup name='%s'", def->name); + if (def->isDefault) { + virBufferAddLit(buf, " default='yes'"); + } + virBufferAddLit(buf, ">\n"); + virVirtualPortProfileFormat(buf, def->virtPortProfile, " "); + virBufferAddLit(buf, " </portgroup>\n"); +} + char *virNetworkDefFormat(const virNetworkDefPtr def) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -1058,24 +1268,48 @@ char *virNetworkDefFormat(const virNetworkDefPtr def) virBufferAsprintf(&buf, " <uuid>%s</uuid>\n", uuidstr); if (def->forwardType != VIR_NETWORK_FORWARD_NONE) { + const char *dev = virNetworkDefForwardIf(def, 0); const char *mode = virNetworkForwardTypeToString(def->forwardType); - if (mode) { - if (def->forwardDev) { - virBufferEscapeString(&buf, " <forward dev='%s'", - def->forwardDev); - } else { - virBufferAddLit(&buf, " <forward"); + + if (!mode) { + virNetworkReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown forward type %d in network '%s'"), + def->forwardType, def->name); + goto error; + } + virBufferAddLit(&buf, " <forward"); + if (dev) + virBufferEscapeString(&buf, " dev='%s'", dev); + virBufferAsprintf(&buf, " mode='%s'%s>\n", mode, + def->nForwardIfs ? "" : "/"); + + if (def->nForwardIfs) { + for (ii = 0; ii < def->nForwardIfs; ii++) { + if (def->forwardIfs[ii].dev) { + virBufferEscapeString(&buf, " <interface dev='%s'/>\n", + def->forwardIfs[ii].dev); + } } - virBufferAsprintf(&buf, " mode='%s'/>\n", mode); + virBufferAddLit(&buf, " </forward>\n"); } } - virBufferAddLit(&buf, " <bridge"); - if (def->bridge) - virBufferEscapeString(&buf, " name='%s'", def->bridge); - virBufferAsprintf(&buf, " stp='%s' delay='%ld' />\n", - def->stp ? "on" : "off", - def->delay); + if (def->forwardType == VIR_NETWORK_FORWARD_NONE || + def->forwardType == VIR_NETWORK_FORWARD_NAT || + def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { + + virBufferAddLit(&buf, " <bridge"); + if (def->bridge) + virBufferEscapeString(&buf, " name='%s'", def->bridge); + virBufferAsprintf(&buf, " stp='%s' delay='%ld' />\n", + def->stp ? "on" : "off", + def->delay); + } else if (def->forwardType == VIR_NETWORK_FORWARD_BRIDGE && + def->bridge) { + virBufferEscapeString(&buf, " <bridge name='%s' />\n", def->bridge); + } + + if (def->mac_specified) { char macaddr[VIR_MAC_STRING_BUFLEN]; virFormatMacAddr(def->mac, macaddr); @@ -1093,6 +1327,11 @@ char *virNetworkDefFormat(const virNetworkDefPtr def) goto error; } + virVirtualPortProfileFormat(&buf, def->virtPortProfile, " "); + + for (ii = 0; ii < def->nPortGroups; ii++) + virPortGroupDefFormat(&buf, &def->portGroups[ii]); + virBufferAddLit(&buf, "</network>\n"); if (virBufferError(&buf)) @@ -1107,6 +1346,22 @@ char *virNetworkDefFormat(const virNetworkDefPtr def) return NULL; } +virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, + const char *portgroup) +{ + int ii; + for (ii = 0; ii < net->nPortGroups; ii++) { + if (portgroup) { + if (STREQ(portgroup, net->portGroups[ii].name)) + return &net->portGroups[ii]; + } else { + if (net->portGroups[ii].isDefault) + return &net->portGroups[ii]; + } + } + return NULL; +} + int virNetworkSaveXML(const char *configDir, virNetworkDefPtr def, const char *xml) @@ -1209,11 +1464,16 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - /* Generate a bridge if none is specified, but don't check for collisions - * if a bridge is hardcoded, so the network is at least defined - */ - if (virNetworkSetBridgeName(nets, def, 0)) - goto error; + if (def->forwardType == VIR_NETWORK_FORWARD_NONE || + def->forwardType == VIR_NETWORK_FORWARD_NAT || + def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { + + /* Generate a bridge if none is specified, but don't check for collisions + * if a bridge is hardcoded, so the network is at least defined. + */ + if (virNetworkSetBridgeName(nets, def, 0)) + goto error; + } if (!(net = virNetworkAssignDef(nets, def))) goto error; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 5edcf27..92cc03e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -33,11 +33,14 @@ # include "network.h" # include "util.h" -/* 2 possible types of forwarding */ enum virNetworkForwardType { VIR_NETWORK_FORWARD_NONE = 0, VIR_NETWORK_FORWARD_NAT, VIR_NETWORK_FORWARD_ROUTE, + VIR_NETWORK_FORWARD_BRIDGE, + VIR_NETWORK_FORWARD_PRIVATE, + VIR_NETWORK_FORWARD_VEPA, + VIR_NETWORK_FORWARD_PASSTHROUGH, VIR_NETWORK_FORWARD_LAST, }; @@ -107,6 +110,21 @@ struct _virNetworkIpDef { virSocketAddr bootserver; }; +typedef struct _virNetworkForwardIfDef virNetworkForwardIfDef; +typedef virNetworkForwardIfDef *virNetworkForwardIfDefPtr; +struct _virNetworkForwardIfDef { + char *dev; /* name of device */ + int usageCount; /* how many guest interfaces are bound to this device? */ +}; + +typedef struct _virPortGroupDef virPortGroupDef; +typedef virPortGroupDef *virPortGroupDefPtr; +struct _virPortGroupDef { + char *name; + bool isDefault; + virVirtualPortProfileParamsPtr virtPortProfile; +}; + typedef struct _virNetworkDef virNetworkDef; typedef virNetworkDef *virNetworkDefPtr; struct _virNetworkDef { @@ -121,12 +139,21 @@ struct _virNetworkDef { bool mac_specified; int forwardType; /* One of virNetworkForwardType constants */ - char *forwardDev; /* Destination device for forwarding */ + + /* If there are multiple forward devices (i.e. a pool of + * interfaces), they will be listed here. + */ + size_t nForwardIfs; + virNetworkForwardIfDefPtr forwardIfs; size_t nips; virNetworkIpDefPtr ips; /* ptr to array of IP addresses on this network */ virNetworkDNSDefPtr dns; /* ptr to dns related configuration */ + virVirtualPortProfileParamsPtr virtPortProfile; + + size_t nPortGroups; + virPortGroupDefPtr portGroups; }; typedef struct _virNetworkObj virNetworkObj; @@ -179,6 +206,16 @@ virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, char *virNetworkDefFormat(const virNetworkDefPtr def); +static inline const char * +virNetworkDefForwardIf(const virNetworkDefPtr def, size_t n) +{ + return ((def->forwardIfs && (def->nForwardIfs > n)) + ? def->forwardIfs[n].dev : NULL); +} + +virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, + const char *portgroup); + virNetworkIpDefPtr virNetworkDefGetIpByIndex(const virNetworkDefPtr def, int family, size_t n); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 63e8aea..1b6d1b0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -748,6 +748,7 @@ virNetworkRemoveInactive; virNetworkSaveConfig; virNetworkSetBridgeMacAddr; virNetworkSetBridgeName; +virPortGroupFindByName; # node_device_conf.h virNodeDevCapTypeToString; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0a12bc0..4459146 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -898,6 +898,7 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); + const char *forwardIf = virNetworkDefForwardIf(network->def, 0); if (prefix < 0) { networkReportError(VIR_ERR_INTERNAL_ERROR, @@ -911,7 +912,7 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev) < 0) { + forwardIf) < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow forwarding from '%s'"), network->def->bridge); @@ -925,7 +926,7 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev) < 0) { + forwardIf) < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow forwarding to '%s'"), network->def->bridge); @@ -959,11 +960,12 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, if (iptablesAddForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, NULL) < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, - _("failed to add iptables rule to enable masquerading to '%s'"), - network->def->forwardDev ? network->def->forwardDev : NULL); + _("failed to add iptables rule to enable masquerading%s%s"), + forwardIf ? " to " : "", + forwardIf ? forwardIf : ""); goto masqerr3; } @@ -971,11 +973,12 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, if (iptablesAddForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, "udp") < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, - _("failed to add iptables rule to enable UDP masquerading to '%s'"), - network->def->forwardDev ? network->def->forwardDev : NULL); + _("failed to add iptables rule to enable UDP masquerading%s%s"), + forwardIf ? " to " : "", + forwardIf ? forwardIf : ""); goto masqerr4; } @@ -983,11 +986,12 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, if (iptablesAddForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, "tcp") < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, - _("failed to add iptables rule to enable TCP masquerading to '%s'"), - network->def->forwardDev ? network->def->forwardDev : NULL); + _("failed to add iptables rule to enable TCP masquerading%s%s"), + forwardIf ? " to " : "", + forwardIf ? forwardIf : ""); goto masqerr5; } @@ -997,26 +1001,26 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, iptablesRemoveForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, "udp"); masqerr4: iptablesRemoveForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, NULL); masqerr3: iptablesRemoveForwardAllowRelatedIn(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); masqerr2: iptablesRemoveForwardAllowOut(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); masqerr1: return -1; } @@ -1027,34 +1031,35 @@ networkRemoveMasqueradingIptablesRules(struct network_driver *driver, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); + const char *forwardIf = virNetworkDefForwardIf(network->def, 0); if (prefix >= 0) { iptablesRemoveForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, "tcp"); iptablesRemoveForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, "udp"); iptablesRemoveForwardMasquerade(driver->iptables, &ipdef->address, prefix, - network->def->forwardDev, + forwardIf, NULL); iptablesRemoveForwardAllowRelatedIn(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); iptablesRemoveForwardAllowOut(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); } } @@ -1064,6 +1069,7 @@ networkAddRoutingIptablesRules(struct network_driver *driver, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); + const char *forwardIf = virNetworkDefForwardIf(network->def, 0); if (prefix < 0) { networkReportError(VIR_ERR_INTERNAL_ERROR, @@ -1077,7 +1083,7 @@ networkAddRoutingIptablesRules(struct network_driver *driver, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev) < 0) { + forwardIf) < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow routing from '%s'"), network->def->bridge); @@ -1089,7 +1095,7 @@ networkAddRoutingIptablesRules(struct network_driver *driver, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev) < 0) { + forwardIf) < 0) { networkReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow routing to '%s'"), network->def->bridge); @@ -1103,7 +1109,7 @@ routeerr2: &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); routeerr1: return -1; } @@ -1114,19 +1120,20 @@ networkRemoveRoutingIptablesRules(struct network_driver *driver, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); + const char *forwardIf = virNetworkDefForwardIf(network->def, 0); if (prefix >= 0) { iptablesRemoveForwardAllowIn(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); iptablesRemoveForwardAllowOut(driver->iptables, &ipdef->address, prefix, network->def->bridge, - network->def->forwardDev); + forwardIf); } } @@ -2171,10 +2178,18 @@ static virNetworkPtr networkCreate(virConnectPtr conn, const char *xml) { if (virNetworkObjIsDuplicate(&driver->networks, def, 1) < 0) goto cleanup; - if (virNetworkSetBridgeName(&driver->networks, def, 1)) - goto cleanup; + /* Only the three L3 network types that are configured by libvirt + * need to have a bridge device name / mac address provided + */ + if (def->forwardType == VIR_NETWORK_FORWARD_NONE || + def->forwardType == VIR_NETWORK_FORWARD_NAT || + def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { - virNetworkSetBridgeMacAddr(def); + if (virNetworkSetBridgeName(&driver->networks, def, 1)) + goto cleanup; + + virNetworkSetBridgeMacAddr(def); + } if (!(network = virNetworkAssignDef(&driver->networks, def))) @@ -2216,10 +2231,18 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { if (virNetworkObjIsDuplicate(&driver->networks, def, 0) < 0) goto cleanup; - if (virNetworkSetBridgeName(&driver->networks, def, 1)) - goto cleanup; + /* Only the three L3 network types that are configured by libvirt + * need to have a bridge device name / mac address provided + */ + if (def->forwardType == VIR_NETWORK_FORWARD_NONE || + def->forwardType == VIR_NETWORK_FORWARD_NAT || + def->forwardType == VIR_NETWORK_FORWARD_ROUTE) { - virNetworkSetBridgeMacAddr(def); + if (virNetworkSetBridgeName(&driver->networks, def, 1)) + goto cleanup; + + virNetworkSetBridgeMacAddr(def); + } if (!(network = virNetworkAssignDef(&driver->networks, def))) diff --git a/tests/networkxml2xmlin/8021Qbh-net.xml b/tests/networkxml2xmlin/8021Qbh-net.xml new file mode 100644 index 0000000..2d779dc --- /dev/null +++ b/tests/networkxml2xmlin/8021Qbh-net.xml @@ -0,0 +1,14 @@ +<network> + <name>8021Qbh-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8c</uuid> + <forward mode="private" dev="eth1"> + <interface dev="eth1"/> + <interface dev="eth2"/> + <interface dev="eth3"/> + <interface dev="eth4"/> + <interface dev="eth5"/> + </forward> + <virtualport type="802.1Qbh"> + <parameters profileid="spongebob24"/> + </virtualport> +</network> diff --git a/tests/networkxml2xmlin/direct-net.xml b/tests/networkxml2xmlin/direct-net.xml new file mode 100644 index 0000000..d73c454 --- /dev/null +++ b/tests/networkxml2xmlin/direct-net.xml @@ -0,0 +1,7 @@ +<network> + <name>direct-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8f</uuid> + <forward mode="bridge"> + <interface dev="eth10"/> + </forward> +</network> diff --git a/tests/networkxml2xmlin/host-bridge-net.xml b/tests/networkxml2xmlin/host-bridge-net.xml new file mode 100644 index 0000000..960bc2d --- /dev/null +++ b/tests/networkxml2xmlin/host-bridge-net.xml @@ -0,0 +1,6 @@ +<network> + <name>host-bridge-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8e</uuid> + <forward mode="bridge"/> + <bridge name="br0"/> +</network> diff --git a/tests/networkxml2xmlin/vepa-net.xml b/tests/networkxml2xmlin/vepa-net.xml new file mode 100644 index 0000000..b1a40c6 --- /dev/null +++ b/tests/networkxml2xmlin/vepa-net.xml @@ -0,0 +1,22 @@ +<network> + <name>vepa-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8b</uuid> + <forward mode="vepa"> + <interface dev="eth1"/> + <interface dev="eth2"/> + <interface dev="eth3"/> + </forward> + <virtualport type="802.1Qbg"> + <parameters managerid="11" typeid="1193047" typeidversion="2" instanceid="b153fa89-1b87-9719-ec12-99e0054fb844"/> + </virtualport> + <portgroup name="bob" default="yes"> + <virtualport type="802.1Qbg"> + <parameters managerid="12" typeid="2193047" typeidversion="3" instanceid="5d00e0ba-e15c-959c-fbb6-b595b0655735"/> + </virtualport> + </portgroup> + <portgroup name="alice"> + <virtualport type="802.1Qbg"> + <parameters managerid="13" typeid="3193047" typeidversion="4" instanceid="70bf45f9-01a8-f5ee-3c0f-e25a0a2e44a6"/> + </virtualport> + </portgroup> +</network> diff --git a/tests/networkxml2xmlout/8021Qbh-net.xml b/tests/networkxml2xmlout/8021Qbh-net.xml new file mode 100644 index 0000000..d4d5b4b --- /dev/null +++ b/tests/networkxml2xmlout/8021Qbh-net.xml @@ -0,0 +1,14 @@ +<network> + <name>8021Qbh-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8c</uuid> + <forward dev='eth1' mode='private'> + <interface dev='eth1'/> + <interface dev='eth2'/> + <interface dev='eth3'/> + <interface dev='eth4'/> + <interface dev='eth5'/> + </forward> + <virtualport type='802.1Qbh'> + <parameters profileid='spongebob24'/> + </virtualport> +</network> diff --git a/tests/networkxml2xmlout/direct-net.xml b/tests/networkxml2xmlout/direct-net.xml new file mode 100644 index 0000000..56cd707 --- /dev/null +++ b/tests/networkxml2xmlout/direct-net.xml @@ -0,0 +1,7 @@ +<network> + <name>direct-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8f</uuid> + <forward dev='eth10' mode='bridge'> + <interface dev='eth10'/> + </forward> +</network> diff --git a/tests/networkxml2xmlout/host-bridge-net.xml b/tests/networkxml2xmlout/host-bridge-net.xml new file mode 100644 index 0000000..84992a9 --- /dev/null +++ b/tests/networkxml2xmlout/host-bridge-net.xml @@ -0,0 +1,6 @@ +<network> + <name>host-bridge-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8e</uuid> + <forward mode='bridge'/> + <bridge name='br0' /> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml b/tests/networkxml2xmlout/nat-network-dns-hosts.xml index 9a83fed..b26fa03 100644 --- a/tests/networkxml2xmlout/nat-network-dns-hosts.xml +++ b/tests/networkxml2xmlout/nat-network-dns-hosts.xml @@ -1,7 +1,9 @@ <network> <name>default</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward dev='eth0' mode='nat'/> + <forward dev='eth0' mode='nat'> + <interface dev='eth0'/> + </forward> <bridge name='virbr0' stp='on' delay='0' /> <dns> <host ip='192.168.122.1'> diff --git a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml index bd16976..f767f48 100644 --- a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml +++ b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml @@ -1,7 +1,9 @@ <network> <name>default</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> <bridge name='virbr0' stp='on' delay='0' /> <dns> <txt name='example' value='example value' /> diff --git a/tests/networkxml2xmlout/nat-network.xml b/tests/networkxml2xmlout/nat-network.xml index eb71d9e..02d6849 100644 --- a/tests/networkxml2xmlout/nat-network.xml +++ b/tests/networkxml2xmlout/nat-network.xml @@ -1,7 +1,9 @@ <network> <name>default</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> <bridge name='virbr0' stp='on' delay='0' /> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> diff --git a/tests/networkxml2xmlout/routed-network.xml b/tests/networkxml2xmlout/routed-network.xml index 3aa8109..9235e15 100644 --- a/tests/networkxml2xmlout/routed-network.xml +++ b/tests/networkxml2xmlout/routed-network.xml @@ -1,7 +1,9 @@ <network> <name>local</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='route'/> + <forward dev='eth1' mode='route'> + <interface dev='eth1'/> + </forward> <bridge name='virbr1' stp='on' delay='0' /> <mac address='12:34:56:78:9A:BC'/> <ip address='192.168.122.1' netmask='255.255.255.0'> diff --git a/tests/networkxml2xmlout/vepa-net.xml b/tests/networkxml2xmlout/vepa-net.xml new file mode 100644 index 0000000..af13d0f --- /dev/null +++ b/tests/networkxml2xmlout/vepa-net.xml @@ -0,0 +1,22 @@ +<network> + <name>vepa-net</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8b</uuid> + <forward dev='eth1' mode='vepa'> + <interface dev='eth1'/> + <interface dev='eth2'/> + <interface dev='eth3'/> + </forward> + <virtualport type='802.1Qbg'> + <parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='b153fa89-1b87-9719-ec12-99e0054fb844'/> + </virtualport> + <portgroup name='bob' default='yes'> + <virtualport type='802.1Qbg'> + <parameters managerid='12' typeid='2193047' typeidversion='3' instanceid='5d00e0ba-e15c-959c-fbb6-b595b0655735'/> + </virtualport> + </portgroup> + <portgroup name='alice'> + <virtualport type='802.1Qbg'> + <parameters managerid='13' typeid='3193047' typeidversion='4' instanceid='70bf45f9-01a8-f5ee-3c0f-e25a0a2e44a6'/> + </virtualport> + </portgroup> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 065166d..f354b0d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -88,6 +88,10 @@ mymain(void) DO_TEST("netboot-proxy-network"); DO_TEST("nat-network-dns-txt-record"); DO_TEST("nat-network-dns-hosts"); + DO_TEST("8021Qbh-net"); + DO_TEST("direct-net"); + DO_TEST("host-bridge-net"); + DO_TEST("vepa-net"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -- 1.7.3.4

On Wed, Jul 20, 2011 at 02:21:55AM -0400, Laine Stump wrote: [...] Modularity is nice but you forgot networkcommon.rng in the patch, right ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Thu, Jul 21, 2011 at 03:14:30AM -0400, Laine Stump wrote: Yeah, I noticed but after sending the mail ... sorry :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

The network driver needs to assign physical devices for use by modes that use macvtap, keeping track of which physical devices are in use (and how many instances, when the devices can be shared). Three calls are added: networkAllocateActualDevice - finds a physical device for use by the domain, and sets up the virDomainActualNetDef accordingly. networkNotifyActualDevice - assumes that the domain was already running, but libvirtd was restarted, and needs to be notified by each already-running domain about what interfaces they are using. networkReleaseActualDevice - decrements the usage count of the allocated physical device, and frees the virDomainActualNetDef to avoid later accidentally using the device. bridge_driver.[hc] - the new APIs. When WITH_NETWORK is false, these functions are all defined inline static in the .h file (and become a NOP) to prevent link errors. qemu_(command|driver|hotplug|process).c - add calls to the above APIs in the appropriate places. tests/Makefile.am - need to include libvirt_driver_network.la whenever libvirt_driver_qemu.la is linked, to avoid unreferenced symbols (in functions that are never called by the test programs...) --- Change from V1: rather than making things compile properly when configured with --without-network by dropping #if WITH_NETWORK all over in the .c files, in this version I just redefine the functions in question (network.....()) as static inline in the .h file when WITH_NETWORK is false: https://www.redhat.com/archives/libvir-list/2011-July/msg00534.html This works perfectly, but "make syntax-check" doesn't like the fact that I've put ATTRIBUTE_UNUSED on the args of the function prototype. I think make syntax-check should be changed to allow ATTRIBUTE_UNUSED in a .h file, as long as it's part of a function definition (rather than declaration), but could be convinced otherwise if needed to get this pushed sooner. src/libvirt_network.syms | 3 + src/network/bridge_driver.c | 372 +++++++++++++++++++++++++++++++++++++++++++ src/network/bridge_driver.h | 28 ++++ src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_hotplug.c | 40 ++++-- src/qemu/qemu_process.c | 25 +++- tests/Makefile.am | 15 ++- 7 files changed, 476 insertions(+), 18 deletions(-) diff --git a/src/libvirt_network.syms b/src/libvirt_network.syms index 6be5e45..e402b5f 100644 --- a/src/libvirt_network.syms +++ b/src/libvirt_network.syms @@ -3,4 +3,7 @@ # # bridge_driver.h +networkAllocateActualDevice; networkBuildDhcpDaemonCommandLine; +networkNotifyActualDevice; +networkReleaseActualDevice; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8767af9..15e0710 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2715,3 +2715,375 @@ int networkRegister(void) { virRegisterStateDriver(&networkStateDriver); return 0; } + +/********************************************************/ + +/* Private API to deal with logical switch capabilities. + * These functions are exported so that other parts of libvirt can + * call them, but are not part of the public API and not in the + * driver's function table. If we ever have more than one network + * driver, we will need to present these functions via a second + * "backend" function table. + */ + +/* networkAllocateActualDevice: + * @iface: the original NetDef from the domain + * + * Looks up the network reference by iface, allocates a physical + * device from that network (if appropriate), and returns with the + * virDomainActualNetDef filled in accordingly. If there are no + * changes to be made in the netdef, then just leave the actualdef + * empty. + * + * Returns 0 on success, -1 on failure. + */ +int +networkAllocateActualDevice(virDomainNetDefPtr iface) +{ + struct network_driver *driver = driverState; + virNetworkObjPtr network; + virNetworkDefPtr netdef; + int ret = -1; + + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) + return 0; + + virDomainActualNetDefFree(iface->data.network.actual); + iface->data.network.actual = NULL; + + networkDriverLock(driver); + network = virNetworkFindByName(&driver->networks, iface->data.network.name); + networkDriverUnlock(driver); + if (!network) { + networkReportError(VIR_ERR_NO_NETWORK, + _("no network with matching name '%s'"), + iface->data.network.name); + goto cleanup; + } + + netdef = network->def; + if ((netdef->forwardType == VIR_NETWORK_FORWARD_BRIDGE) && + netdef->bridge) { + + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + + if (VIR_ALLOC(iface->data.network.actual) < 0) { + virReportOOMError(); + goto cleanup; + } + + iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + iface->data.network.actual->data.bridge.brname = strdup(netdef->bridge); + if (!iface->data.network.actual->data.bridge.brname) { + virReportOOMError(); + goto cleanup; + } + + } else if ((netdef->forwardType == VIR_NETWORK_FORWARD_BRIDGE) || + (netdef->forwardType == VIR_NETWORK_FORWARD_PRIVATE) || + (netdef->forwardType == VIR_NETWORK_FORWARD_VEPA) || + (netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + virVirtualPortProfileParamsPtr virtport = NULL; + + /* <forward type='bridge|private|vepa|passthrough'> are all + * VIR_DOMAIN_NET_TYPE_DIRECT. + */ + + if (VIR_ALLOC(iface->data.network.actual) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* Set type=direct and appropriate <source mode='xxx'/> */ + iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_DIRECT; + switch (netdef->forwardType) { + case VIR_NETWORK_FORWARD_BRIDGE: + iface->data.network.actual->data.direct.mode = VIR_MACVTAP_MODE_BRIDGE; + break; + case VIR_NETWORK_FORWARD_PRIVATE: + iface->data.network.actual->data.direct.mode = VIR_MACVTAP_MODE_PRIVATE; + break; + case VIR_NETWORK_FORWARD_VEPA: + iface->data.network.actual->data.direct.mode = VIR_MACVTAP_MODE_VEPA; + break; + case VIR_NETWORK_FORWARD_PASSTHROUGH: + iface->data.network.actual->data.direct.mode = VIR_MACVTAP_MODE_PASSTHRU; + break; + } + + /* Find the most specific virtportprofile and copy it */ + if (iface->data.network.virtPortProfile) { + virtport = iface->data.network.virtPortProfile; + } else { + virPortGroupDefPtr portgroup + = virPortGroupFindByName(netdef, iface->data.network.portgroup); + if (portgroup) + virtport = portgroup->virtPortProfile; + else + virtport = netdef->virtPortProfile; + } + if (virtport) { + if (VIR_ALLOC(iface->data.network.actual->data.direct.virtPortProfile) < 0) { + virReportOOMError(); + goto cleanup; + } + /* There are no pointers in a virtualPortProfile, so a shallow copy + * is sufficient + */ + *iface->data.network.actual->data.direct.virtPortProfile = *virtport; + } + /* If there is only a single device, just return it (caller will detect + * any error if exclusive use is required but could be acquired). + */ + if (netdef->nForwardIfs == 0) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' uses a direct mode, but has no forward dev and no interface pool"), + netdef->name); + goto cleanup; + } else { + int ii; + virNetworkForwardIfDefPtr dev = NULL; + + /* pick an interface from the pool */ + + /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both require + * exclusive access to a device, so current usageCount must be + * 0. Other modes can share, so just search for the one with + * the lowest usageCount. + */ + if ((netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH) || + ((netdef->forwardType == VIR_NETWORK_FORWARD_PRIVATE) && + iface->data.network.actual->data.direct.virtPortProfile && + (iface->data.network.actual->data.direct.virtPortProfile->virtPortType + == VIR_VIRTUALPORT_8021QBH))) { + /* pick first dev with 0 usageCount */ + + for (ii = 0; ii < netdef->nForwardIfs; ii++) { + if (netdef->forwardIfs[ii].usageCount == 0) { + dev = &netdef->forwardIfs[ii]; + break; + } + } + } else { + /* pick least used dev */ + dev = &netdef->forwardIfs[0]; + for (ii = 1; ii < netdef->nForwardIfs; ii++) { + if (netdef->forwardIfs[ii].usageCount < dev->usageCount) + dev = &netdef->forwardIfs[ii]; + } + } + /* dev points at the physical device we want to use */ + if (!dev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' requires exclusive access to interfaces, but none are available"), + netdef->name); + goto cleanup; + } + iface->data.network.actual->data.direct.linkdev = strdup(dev->dev); + if (!iface->data.network.actual->data.direct.linkdev) { + virReportOOMError(); + goto cleanup; + } + /* we are now assured of success, so mark the allocation */ + dev->usageCount++; + VIR_DEBUG("Using physical device %s, usageCount %d", + dev->dev, dev->usageCount); + } + } + + ret = 0; +cleanup: + if (network) + virNetworkObjUnlock(network); + if (ret < 0) { + virDomainActualNetDefFree(iface->data.network.actual); + iface->data.network.actual = NULL; + } + return ret; +} + +/* networkNotifyActualDevice: + * @iface: the domain's NetDef with an "actual" device already filled in. + * + * Called to notify the network driver when libvirtd is restarted and + * finds an already running domain. If appropriate it will force an + * allocation of the actual->direct.linkdev to get everything back in + * order. + * + * Returns 0 on success, -1 on failure. + */ +int +networkNotifyActualDevice(virDomainNetDefPtr iface) +{ + struct network_driver *driver = driverState; + virNetworkObjPtr network; + virNetworkDefPtr netdef; + char *actualDev; + int ret = -1; + + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) + return 0; + + if (!iface->data.network.actual || + (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_DIRECT)) { + VIR_DEBUG("Nothing to claim from network %s", iface->data.network.name); + return 0; + } + + networkDriverLock(driver); + network = virNetworkFindByName(&driver->networks, iface->data.network.name); + networkDriverUnlock(driver); + if (!network) { + networkReportError(VIR_ERR_NO_NETWORK, + _("no network with matching name '%s'"), + iface->data.network.name); + goto cleanup; + } + + actualDev = virDomainNetGetActualDirectDev(iface); + if (!actualDev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("the interface uses a direct mode, but has no source dev")); + goto cleanup; + } + + netdef = network->def; + if (netdef->nForwardIfs == 0) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' uses a direct mode, but has no forward dev and no interface pool"), + netdef->name); + goto cleanup; + } else { + int ii; + virNetworkForwardIfDefPtr dev = NULL; + + /* find the matching interface in the pool and increment its usageCount */ + + for (ii = 0; ii < netdef->nForwardIfs; ii++) { + if (STREQ(actualDev, netdef->forwardIfs[ii].dev)) { + dev = &netdef->forwardIfs[ii]; + break; + } + } + /* dev points at the physical device we want to use */ + if (!dev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' doesn't have dev='%s' in use by domain"), + netdef->name, actualDev); + goto cleanup; + } + + /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both require + * exclusive access to a device, so current usageCount must be + * 0 in those cases. + */ + if ((dev->usageCount > 0) && + ((netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH) || + ((netdef->forwardType == VIR_NETWORK_FORWARD_PRIVATE) && + iface->data.network.actual->data.direct.virtPortProfile && + (iface->data.network.actual->data.direct.virtPortProfile->virtPortType + == VIR_VIRTUALPORT_8021QBH)))) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' claims dev='%s' is already in use by a different domain"), + netdef->name, actualDev); + goto cleanup; + } + /* we are now assured of success, so mark the allocation */ + dev->usageCount++; + VIR_DEBUG("Using physical device %s, usageCount %d", + dev->dev, dev->usageCount); + } + + ret = 0; +cleanup: + if (network) + virNetworkObjUnlock(network); + return ret; +} + + +/* networkReleaseActualDevice: + * @iface: a domain's NetDef (interface definition) + * + * Given a domain <interface> element that previously had its <actual> + * element filled in (and possibly a physical device allocated to it), + * free up the physical device for use by someone else, and free the + * virDomainActualNetDef. + * + * Returns 0 on success, -1 on failure. + */ +int +networkReleaseActualDevice(virDomainNetDefPtr iface) +{ + struct network_driver *driver = driverState; + virNetworkObjPtr network = NULL; + virNetworkDefPtr netdef; + char *actualDev; + int ret = -1; + + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) + return 0; + + if (!iface->data.network.actual || + (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_DIRECT)) { + VIR_DEBUG("Nothing to release to network %s", iface->data.network.name); + ret = 0; + goto cleanup; + } + + networkDriverLock(driver); + network = virNetworkFindByName(&driver->networks, iface->data.network.name); + networkDriverUnlock(driver); + if (!network) { + networkReportError(VIR_ERR_NO_NETWORK, + _("no network with matching name '%s'"), + iface->data.network.name); + goto cleanup; + } + + actualDev = virDomainNetGetActualDirectDev(iface); + if (!actualDev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("the interface uses a direct mode, but has no source dev")); + goto cleanup; + } + + netdef = network->def; + if (netdef->nForwardIfs == 0) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' uses a direct mode, but has no forward dev and no interface pool"), + netdef->name); + goto cleanup; + } else { + int ii; + virNetworkForwardIfDefPtr dev = NULL; + + for (ii = 0; ii < netdef->nForwardIfs; ii++) { + if (STREQ(actualDev, netdef->forwardIfs[ii].dev)) { + dev = &netdef->forwardIfs[ii]; + break; + } + } + /* dev points at the physical device we've been using */ + if (!dev) { + networkReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' doesn't have dev='%s' in use by domain"), + netdef->name, actualDev); + goto cleanup; + } + + dev->usageCount--; + VIR_DEBUG("Releasing physical device %s, usageCount %d", + dev->dev, dev->usageCount); + } + + ret = 0; +cleanup: + if (network) + virNetworkObjUnlock(network); + virDomainActualNetDefFree(iface->data.network.actual); + iface->data.network.actual = NULL; + return ret; +} diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 2896c84..710d862 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -29,13 +29,41 @@ # include "internal.h" # include "network_conf.h" +# include "domain_conf.h" # include "command.h" # include "dnsmasq.h" int networkRegister(void); + +#if WITH_NETWORK +int networkAllocateActualDevice(virDomainNetDefPtr iface); +int networkNotifyActualDevice(virDomainNetDefPtr iface); +int networkReleaseActualDevice(virDomainNetDefPtr iface); + int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, char *pidfile, dnsmasqContext *dctx); +#else +static inline int +networkAllocateActualDevice(virDomainNetDefPtr iface ATTRIBUTE_UNUSED) +{ return 0; } + +static inline int +networkNotifyActualDevice(virDomainNetDefPtr iface ATTRIBUTE_UNUSED) +{ return 0; } + +static inline int +networkReleaseActualDevice(virDomainNetDefPtr iface ATTRIBUTE_UNUSED) +{ return 0; } + +static inline int +networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network ATTRIBUTE_UNUSED, + virCommandPtr *cmdout ATTRIBUTE_UNUSED, + char *pidfile ATTRIBUTE_UNUSED, + dnsmasqContext *dctx ATTRIBUTE_UNUSED) +{ return 0; } + +#endif typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 172e394..0ae8d67 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -37,6 +37,7 @@ #include "domain_nwfilter.h" #include "domain_audit.h" #include "domain_conf.h" +#include "network/bridge_driver.h" #include <sys/utsname.h> #include <sys/stat.h> @@ -3697,6 +3698,13 @@ qemuBuildCommandLine(virConnectPtr conn, else vlan = i; + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(net) < 0) + goto error; + actualType = virDomainNetGetActualType(net); if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { @@ -4693,6 +4701,9 @@ qemuBuildCommandLine(virConnectPtr conn, no_memory: virReportOOMError(); error: + /* free up any resources in the network driver */ + for (i = 0 ; i < def->nnets ; i++) + networkReleaseActualDevice(def->nets[i]); for (i = 0; i <= last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); virBufferFreeAndReset(&rbd_hosts); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 128b9ea..74ce9be 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -39,6 +39,7 @@ #include "files.h" #include "qemu_cgroup.h" #include "locking/domain_lock.h" +#include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -603,7 +604,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, virDomainDevicePCIAddress guestAddr; int vlan; bool releaseaddr = false; - int actualType = virDomainNetGetActualType(net); + bool iface_connected = false; + int actualType; if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_HOST_NET_ADD)) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -611,18 +613,28 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, return -1; } + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(net) < 0) + goto cleanup; + + actualType = virDomainNetGetActualType(net); if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { if ((tapfd = qemuNetworkIfaceConnect(vm->def, conn, driver, net, priv->qemuCaps)) < 0) - return -1; + goto cleanup; + iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { if ((tapfd = qemuPhysIfaceConnect(vm->def, conn, driver, net, priv->qemuCaps, VIR_VM_OP_CREATE)) < 0) - return -1; + goto cleanup; + iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) goto cleanup; } @@ -738,16 +750,19 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, vm->def->nets[vm->def->nnets++] = net; cleanup: - if ((ret != 0) && - qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && - (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - releaseaddr && - qemuDomainPCIAddressReleaseSlot(priv->pciaddrs, - net->info.addr.pci.slot) < 0) - VIR_WARN("Unable to release PCI address on NIC"); + if (ret < 0) { + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && + (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && + releaseaddr && + qemuDomainPCIAddressReleaseSlot(priv->pciaddrs, + net->info.addr.pci.slot) < 0) + VIR_WARN("Unable to release PCI address on NIC"); - if (ret != 0) - virDomainConfNWFilterTeardown(net); + if (iface_connected) + virDomainConfNWFilterTeardown(net); + + networkReleaseActualDevice(net); + } VIR_FREE(nicstr); VIR_FREE(netstr); @@ -1634,6 +1649,7 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, } } + networkReleaseActualDevice(detach); if (vm->def->nnets > 1) { memmove(vm->def->nets + i, vm->def->nets + i + 1, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3c57a2a..8a8beb1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -56,6 +56,7 @@ #include "domain_audit.h" #include "domain_nwfilter.h" #include "locking/domain_lock.h" +#include "network/bridge_driver.h" #include "uuid.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -2178,6 +2179,19 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm, static int +qemuProcessNotifyNets(virDomainDefPtr def) +{ + int ii; + + for (ii = 0 ; ii < def->nnets ; ii++) { + virDomainNetDefPtr net = def->nets[ii]; + if (networkNotifyActualDevice(net) < 0) + return -1; + } + return 0; +} + +static int qemuProcessFiltersInstantiate(virConnectPtr conn, virDomainDefPtr def) { @@ -2379,6 +2393,9 @@ qemuProcessReconnect(void *payload, const void *name ATTRIBUTE_UNUSED, void *opa if (virSecurityManagerReserveLabel(driver->securityManager, obj) < 0) goto error; + if (qemuProcessNotifyNets(obj->def) < 0) + goto error; + if (qemuProcessFiltersInstantiate(conn, obj->def)) goto error; @@ -3010,10 +3027,10 @@ void qemuProcessStop(struct qemud_driver *driver, qemuDomainReAttachHostDevices(driver, vm->def); -#if WITH_MACVTAP def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; +#if WITH_MACVTAP if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { delMacvtap(net->ifname, net->mac, virDomainNetGetActualDirectDev(net), @@ -3022,8 +3039,12 @@ void qemuProcessStop(struct qemud_driver *driver, driver->stateDir); VIR_FREE(net->ifname); } - } #endif + /* release the physical device (or any other resources used by + * this interface in the network driver + */ + networkReleaseActualDevice(net); + } retry: if ((ret = qemuRemoveCgroup(driver, vm, 0)) < 0) { diff --git a/tests/Makefile.am b/tests/Makefile.am index e9a445e..971ab70 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -314,23 +314,30 @@ EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ endif if WITH_QEMU + +qemu_LDADDS = ../src/libvirt_driver_qemu.la + +if WITH_NETWORK +qemu_LDADDS += ../src/libvirt_driver_network.la +endif + qemuxml2argvtest_SOURCES = \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2argvtest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) +qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) +qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuargv2xmltest_SOURCES = \ qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -qemuargv2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) +qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h -qemuhelptest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) +qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) else EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c qemuhelptest.c testutilsqemu.c testutilsqemu.h endif -- 1.7.3.4