VirtualDisk: Support floppy 'dir' mode (fat:floppy for qemu)

Author: crobinso

tests/clitest.py

@@ -70,6 +70,7 @@
     'ROIMG'             : ro_img,
     'POOL'              : "default-pool",
     'VOL'               : "testvol1.img",
+    'DIR'               : os.getcwd(),
     'MANAGEDEXIST1'     : "/default-pool/testvol1.img",
     'MANAGEDEXIST2'     : "/default-pool/testvol2.img",
     'MANAGEDNEW1'       : "/default-pool/clonevol",
@@ -166,6 +167,8 @@
         "--disk %(COLLIDE)s --force",
         # Two IDE cds
         "--disk path=%(EXISTIMG1)s,device=cdrom --disk path=%(EXISTIMG1)s,device=cdrom",
+        # Dir with a floppy dev
+        "--disk %(DIR)s,device=floppy",
       ],
 
       "invalid": [
@@ -196,7 +199,9 @@
         # Not specifying path= and non existent storage w/ no size
         "--disk %(NEWIMG1)s",
         # Colliding storage without --force
-        "--disk %(COLLIDE)s"
+        "--disk %(COLLIDE)s",
+        # Dir without floppy
+        "--disk %(DIR)s,device=cdrom",
       ]
      }, # category "storage"
 

tests/xmlconfig-xml/boot-many-devices.xml

@@ -26,6 +26,10 @@
       <source dev='/dev/loop0'/>
       <target dev='sda' bus='scsi'/>
     </disk>
+    <disk type='dir' device='floppy'>
+      <source dir='/tmp'/>
+      <target dev='fdb' bus='fdc'/>
+    </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='/default-pool/testvol1.img'/>

tests/xmlconfig.py

@@ -522,6 +522,7 @@ def testManyDevices(self):
                                    device=VirtualDisk.DEVICE_FLOPPY))
         g.disks.append(VirtualDisk(conn=g.conn, path="/dev/loop0",
                                    bus="scsi"))
+        g.disks.append(VirtualDisk(conn=g.conn, path="/tmp", device="floppy"))
         d3 = VirtualDisk(conn=g.conn, path="/default-pool/testvol1.img",
                          bus="scsi", driverName="qemu")
         g.disks.append(d3)

virtinst/VirtualDisk.py

@@ -173,7 +173,8 @@ class VirtualDisk(VirtualDevice):
 
     TYPE_FILE = "file"
     TYPE_BLOCK = "block"
-    types = [TYPE_FILE, TYPE_BLOCK]
+    TYPE_DIR = "dir"
+    types = [TYPE_FILE, TYPE_BLOCK, TYPE_DIR]
 
     @staticmethod
     def path_exists(conn, path):
@@ -614,7 +615,9 @@ def __set_dev_type(self):
             else:
                 dtype = self.TYPE_BLOCK
         elif self.path:
-            if _util.stat_disk(self.path)[0]:
+            if os.path.isdir(self.path):
+                dtype = self.TYPE_DIR
+            elif _util.stat_disk(self.path)[0]:
                 dtype = self.TYPE_FILE
             else:
                 dtype = self.TYPE_BLOCK
@@ -899,8 +902,9 @@ def __validate_params(self):
         if not create_media:
             # Make sure we have access to the local path
             if not managed_storage:
-                if os.path.isdir(self.path) and not _util.is_vdisk(self.path):
-                    # vdisk _is_ a directory.
+                if (os.path.isdir(self.path) and
+                    not _util.is_vdisk(self.path) and
+                    not self.device == self.DEVICE_FLOPPY):
                     raise ValueError(_("The path '%s' must be a file or a "
                                        "device, not a directory") % self.path)
 
@@ -1106,7 +1110,7 @@ def get_xml_config(self, disknode=None):
                          takes precedence.
         @type disknode: C{str}
         """
-        typeattr = 'file'
+        typeattr = self.type
         if self.type == VirtualDisk.TYPE_BLOCK:
             typeattr = 'dev'