Fixed PXE network boot config

diff --git a/ChangeLog b/ChangeLog
index 7ca3407800f1b264c7bedf3057e71e8c07900d99..2ceefeb3de733c3a577b81e2964426d5ff2b8938 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep 13 17:58:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/qemu_conf.c: Fix handling of <boot> tag for network PXE
+       * tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml: Fix test
+       for network PXE boot element
+       * tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c: Fixed potential
+       SEGV crash in error case cleanup
+
 Wed Sep 12 16:35:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/xend_internal.c, src/xml.c, src/xml.h: Properly check buffer

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 2bbd07253cc21e1ca6bdafbdb68376ea59570a19..cc41a57765065bc8ba165b74d5f0dff0e59a1636 100644 (file)
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -1180,7 +1180,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn,
                 def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_FLOPPY;
             } else if (!strcmp((char *)prop, "cdrom")) {
                 def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_CDROM;
-            } else if (!strcmp((char *)prop, "net")) {
+            } else if (!strcmp((char *)prop, "network")) {
                 def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_NET;
             } else {
                 goto error;
@@ -2819,7 +2819,7 @@ char *qemudGenerateXML(virConnectPtr conn,
             boottype = "cdrom";
             break;
         case QEMUD_BOOT_NET:
-            boottype = "net";
+            boottype = "network";
             break;
         }
         if (virBufferVSprintf(buf, "    <boot dev='%s'/>\n", boottype) < 0)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
index 55d4e8a17264f2a1d0bc7c45c186a0a7168c42c0..7ee75257a9b3cffa15131877fd9e482722670ec8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
@@ -6,7 +6,7 @@
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>
-    <boot dev='net'/>
+    <boot dev='network'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ea4b046588ad4e8993c1be41a3b436378876157a..8f0af1205acba8101d39f412bcd1764ab6b2ddf4 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -79,8 +79,8 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) {
         }
         free(argv);
     }
-
-    qemudFreeVMDef(vmdef);
+    if (vmdef)
+        qemudFreeVMDef(vmdef);
     return ret;
 }
 

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index edfee05955e5f90ea817fe86c6aa1894031cdbdf..29e57c4c48c77c0c56f2bca67afc06dc3cd0d6dc 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -48,7 +48,8 @@ static int testCompareXMLToXMLFiles(const char *xml) {
 
  fail:
     free(actual);
-    qemudFreeVMDef(vmdef);
+    if (vmdef)
+        qemudFreeVMDef(vmdef);
     return ret;
 }