Fix networking in paravirt guests

diff --git a/ChangeLog b/ChangeLog
index a0e4e1c21b8a4683d30586812b6adf6335464e1f..5d8203e383ac2eb488d6205b8ce7c7d5b7bc8ed3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+Thu Aug 18 15:22:23 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+       * src/xml.c: fix networking in paravirt guests - only set the
+       '(type ioemu)' option for HVM.
+
 Thu Aug 17 19:42:50 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
-       * src/xml.c: fix virParseUUID() 
+       * src/xml.c: fix virParseUUID()
 
 Wed Aug 16 19:07:52 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
-       * NEWS configure.in doc//* include/libvirt/libvirt.h 
+       * NEWS configure.in doc//* include/libvirt/libvirt.h
          include/libvirt/libvirt.h.in: preparing release of 0.1.4,
          regenerated docs, fixed a few things
        * src/proxy_internal.c src/test.c src/xend_internal.c:
@@ -23,13 +28,13 @@ Wed Aug 16 11:38:02 EDT 2006 Daniel Berrange <berrange@redhat.com>
        setMemory, setMaxMemory, createLinux, dumpXML, setVcpus.
        * docs/testnode.xml, docs/testfc4.xml, docs/testfv0.xml:
        Example config for using with test driver
-       
+
 Wed Aug 16 11:36:21 EDT 2006 Daniel Berrange <berrange@redhat.com>
-       
-       * src/xend_internal.c, src/xml.c, src/xml.h: Refactored the 
+
+       * src/xend_internal.c, src/xml.c, src/xml.h: Refactored the
        sexpr_uuid method into a re-usable virParseUUID method which
        can be used by any backend
-       
+
 Wed Aug 16 11:31:59 EDT 2006 Daniel Berrange <berrange@redhat.com>
 
        * src/libvirt.c: Remove some duplicated changes for VIR_DOMAIN_RO

diff --git a/src/xml.c b/src/xml.c
index e1fcf7a8f6cb029fe633e206e5d3580e72709d0e..d724ad6fece5159f2d48d26d8fbb8960067396ae 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -967,7 +967,7 @@ virDomainParseXMLDiskDesc(xmlNodePtr node, virBufferPtr buf, int hvm)
  * Returns 0 in case of success, -1 in case of error.
  */
 static int
-virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf)
+virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf, int hvm)
 {
     xmlNodePtr cur;
     xmlChar *type = NULL;
@@ -1016,7 +1016,8 @@ virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf)
     }
     if (script != NULL)
         virBufferVSprintf(buf, "(script '%s')", script);
-    virBufferAdd(buf, "(type ioemu)", 12);
+    if (hvm)
+        virBufferAdd(buf, "(type ioemu)", 12);
 
     virBufferAdd(buf, ")", 1);
     if (mac != NULL)
@@ -1210,8 +1211,7 @@ virDomainParseXMLDesc(const char *xmldesc, char **name)
         (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) {
         for (i = 0; i < obj->nodesetval->nodeNr; i++) {
             virBufferAdd(&buf, "(device ", 8);
-            res =
-                virDomainParseXMLIfDesc(obj->nodesetval->nodeTab[i], &buf);
+            res = virDomainParseXMLIfDesc(obj->nodesetval->nodeTab[i], &buf, hvm);
             if (res != 0) {
                 goto error;
             }