Merge pull request #406 from rick-masters/fix-qemu-linux-str-concat

Account for int and NoneType in string concatenations.

Author: stikonas

lib/generator.py

@@ -73,7 +73,7 @@ def prepare(self, target, using_kernel=False, kernel_bootstrap=False, target_siz
             self.target_dir = os.path.join(self.target_dir, 'disk')
             target.add_disk("disk",
                             filesystem="ext3",
-                            size=(target_size + "M") if target_size else "16G",
+                            size=(str(target_size) + "M") if target_size else "16G",
                             bootable=True)
             target.mount_disk("disk", "disk")
             self.external_dir = os.path.join(self.target_dir, 'external')

rootfs.py

@@ -245,17 +245,24 @@ def bootstrap(args, generator, target, size):
         if args.kernel:
             generator.prepare(target, using_kernel=True, target_size=size)
 
-            run(args.qemu_cmd,
+            arg_list = [
                 '-enable-kvm',
                 '-m', str(args.qemu_ram) + 'M',
                 '-smp', str(args.cores),
                 '-no-reboot',
-                '-drive', 'file=' + target.get_disk("disk") + ',format=raw',
-                '-drive', 'file=' + target.get_disk("external") + ',format=raw',
+                '-drive', 'file=' + target.get_disk("disk") + ',format=raw'
+            ]
+            if target.get_disk("external") is not None:
+                arg_list += [
+                    '-drive', 'file=' + target.get_disk("external") + ',format=raw',
+                ]
+            arg_list += [
                 '-nic', 'user,ipv6=off,model=e1000',
                 '-kernel', args.kernel,
                 '-nographic',
-                '-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw')
+                '-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw'
+            ]
+            run(args.qemu_cmd, *arg_list)
         else:
             generator.prepare(target, kernel_bootstrap=True, target_size=size)
             arg_list = [