Escape disk image paths

Author: berrange

tests/misc-xml-escaping.xml

@@ -0,0 +1,36 @@
+<domain type='xen'>
+  <name>TestGuest</name>
+  <currentMemory>204800</currentMemory>
+  <memory>409600</memory>
+  <uuid>12345678-1234-1234-1234-123456789012</uuid>
+  <os>
+    <type>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/><apic/>
+  </features>
+  <clock offset="utc"/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <vcpu>5</vcpu>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <console device='pty'/>
+    <disk type='file' device='disk'>
+      <source file='/ISO&apos;s'/>
+      <target dev='hda'/>
+    </disk>
+    <disk type='block' device='cdrom'>
+      <source dev='/dev/loop0'/>
+      <target dev='hdc'/>
+      <readonly/>
+    </disk>
+
+
+    <input type='mouse' bus='ps2'/>
+    <graphics type='sdl'/>
+  </devices>
+</domain>

tests/xmlconfig.py

@@ -180,6 +180,11 @@ def testInstallFullyvirtDiskBlock(self):
         self._compare(g, "install-fullyvirt-disk-block", True)
 
 
+    def testXMLEscaping(self):
+        g = self._get_basic_fullyvirt_guest()
+        g.disks.append(virtinst.VirtualDisk("/ISO's", type=virtinst.VirtualDisk.TYPE_FILE, size=5))
+        self._compare(g, "misc-xml-escaping", True)
+
 
 if __name__ == "__main__":
     unittest.main()

virtinst/Guest.py

@@ -180,7 +180,8 @@ def get_xml_config(self, disknode):
             else:
                 ret += "      <driver name='%(name)s' type='%(type)s'/>\n" % { "name": self.driver_name, "type": self.driver_type }
         if self.path is not None:
-            ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": self.path }
+            path = self.path.replace("'", "&apos;")
+            ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": path }
         if self.target is not None:
             disknode = self.target
         ret += "      <target dev='%(disknode)s'/>\n" % { "disknode": disknode }