Escape & chars in disk paths too

Author: berrange

tests/misc-xml-escaping.xml

@@ -20,7 +20,7 @@
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <console device='pty'/>
     <disk type='file' device='disk'>
-      <source file='/ISO&apos;s'/>
+      <source file='/ISO&amp;&apos;&amp;s'/>
       <target dev='hda'/>
     </disk>
     <disk type='block' device='cdrom'>

tests/xmlconfig.py

@@ -182,7 +182,7 @@ def testInstallFullyvirtDiskBlock(self):
 
     def testXMLEscaping(self):
         g = self._get_basic_fullyvirt_guest()
-        g.disks.append(virtinst.VirtualDisk("/ISO's", type=virtinst.VirtualDisk.TYPE_FILE, size=5))
+        g.disks.append(virtinst.VirtualDisk("/ISO&'&s", type=virtinst.VirtualDisk.TYPE_FILE, size=5))
         self._compare(g, "misc-xml-escaping", True)
 
 

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:
-            path = self.path.replace("'", "&apos;")
+            path = self.path.replace("&", "&amp;")
+            path = path.replace("'", "&apos;")
             ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": path }
         if self.target is not None:
             disknode = self.target