libvirt0.9.10 will report error if bridge network was defined with script. This is the fix for it, otherwise VM start would fail. Signed-off-by: Wenchao Xia <xiawenc(a)linux.vnet.ibm.com&gt; --- libxkutil/xmlgen.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/libxkutil/xmlgen.c b/libxkutil/xmlgen.c index 2dcd0d2..31619d8 100644 --- a/libxkutil/xmlgen.c +++ b/libxkutil/xmlgen.c @@ -269,18 +269,11 @@ static const char *set_net_source(xmlNodePtr nic, return NULL; } - +/* libvirt 0.9.10 report error if script is set with brdige */ static const char *bridge_net_to_xml(xmlNodePtr nic, struct net_device *dev) { - const char *script = "vif-bridge"; - xmlNodePtr tmp; const char *msg = NULL; - tmp = xmlNewChild(nic, NULL, BAD_CAST "script", NULL); - if (tmp == NULL) - return XML_ERROR; - xmlNewProp(tmp, BAD_CAST "path", BAD_CAST script); - msg = set_net_source(nic, dev, "bridge"); return msg;

Quoting Wenchao Xia <xiawenc(a)linux.vnet.ibm.com&gt;: > Hi, Danial > This is a urgent fix for bug in new release, could u help look at it? > >> libvirt0.9.10 will report error if bridge network was defined >> with script. This is the fix for it, otherwise VM start would fail. >> >> Signed-off-by: Wenchao Xia <xiawenc(a)linux.vnet.ibm.com&gt; >> --- >> libxkutil/xmlgen.c | 9 +-------- >> 1 files changed, 1 insertions(+), 8 deletions(-) >> >> diff --git a/libxkutil/xmlgen.c b/libxkutil/xmlgen.c >> index 2dcd0d2..31619d8 100644 >> --- a/libxkutil/xmlgen.c >> +++ b/libxkutil/xmlgen.c >> @@ -269,18 +269,11 @@ static const char *set_net_source(xmlNodePtr nic, >> return NULL; >> } >> >> - >> +/* libvirt 0.9.10 report error if script is set with brdige */ >> static const char *bridge_net_to_xml(xmlNodePtr nic, struct >> net_device *dev) >> { >> - const char *script = "vif-bridge"; >> - xmlNodePtr tmp; >> const char *msg = NULL; >> >> - tmp = xmlNewChild(nic, NULL, BAD_CAST "script", NULL); >> - if (tmp == NULL) >> - return XML_ERROR; >> - xmlNewProp(tmp, BAD_CAST "path", BAD_CAST script); >> - >> msg = set_net_source(nic, dev, "bridge"); >> >> return msg; There is nothing much left in this function after removing those lines. So, do you still need this funcion or can the remaining code be moved some other place?

Also, please make sure that removing "vif-bridge" does not break any other code path.

-Sharad Mishra >> > > > -- > Best Regards > > Wenchao Xia > > _______________________________________________ > Libvirt-cim mailing list > Libvirt-cim(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvirt-cim _______________________________________________ Libvirt-cim mailing list Libvirt-cim(a)redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim