merge heads

Author: berrange

virt-clone

@@ -94,12 +94,6 @@ def get_clone_diskfile(new_diskfiles, design, conn):
                 if not cli.prompt_for_yes_or_no(warnmsg + _("Do you really want to use the disk (yes or no)? ")):
                     disk = None
                     continue
-            # Overwrite disk?
-            elif os.path.exists(d.path) and os.path.isfile(d.path):
-                warnmsg = _("You are going to overwrite file '%s'!\n") % d.path
-                if not cli.prompt_for_yes_or_no(warnmsg + _("Do you really want to use the file (yes or no)? ")):
-                    disk = None
-                    continue
             new_diskfiles[i] = d.path
             break
 

virt-install

@@ -85,12 +85,6 @@ def get_disk(disk, size, sparse, guest, hvm, conn):
             if not cli.prompt_for_yes_or_no(warnmsg + _("Do you really want to use the disk (yes or no)? ")):
                 disk = size = None
                 continue
-        # Overwrite disk?
-        elif os.path.exists(d.path) and os.path.isfile(d.path):
-            warnmsg = _("You are going to overwrite file '%s'!\n") % d.path
-            if not cli.prompt_for_yes_or_no(warnmsg + _("Do you really want to use the file (yes or no)? ")):
-                disk = None
-                continue
 
         guest.disks.append(d)
         break
@@ -265,7 +259,7 @@ def parse_args():
                       help=_("The CPU architecture to simulate"))
 
     # paravirt options
-    parser.add_option("-p", "--paravirt", action="store_false", dest="paravirt",
+    parser.add_option("-p", "--paravirt", action="store_true", dest="paravirt",
                       help=_("This guest should be a paravirtualized guest"))
     parser.add_option("-l", "--location", type="string", dest="location",
                       action="callback", callback=cli.check_before_store,
@@ -352,13 +346,13 @@ def main():
         print >> sys.stderr, _("Can't do both --hvm and --paravirt")
 
     if options.fullvirt:
-        osType = "hvm"
+        os_type = "hvm"
     elif options.paravirt:
-        osType = "xen"
+        os_type = "xen"
     else:
-        osType = None
+        os_type = None
 
-    guest = capabilities.guestForOSType(type=osType, arch=options.arch)
+    guest = capabilities.guestForOSType(type=os_type, arch=options.arch)
     if guest is None:
         print >> sys.stderr, _("Unsupported virtualization type")
         sys.exit(1)
@@ -375,11 +369,11 @@ def main():
         if not hvm:
             print >> sys.stderr, _("LiveCD installations are not supported for paravirt guests")
             sys.exit(1)
-        installer = virtinst.LiveCDInstaller(type = type)
+        installer = virtinst.LiveCDInstaller(type = type, os_type = os_type)
     elif options.pxe:
-        installer = virtinst.PXEInstaller(type = type)
+        installer = virtinst.PXEInstaller(type = type, os_type = os_type)
     else:
-        installer = virtinst.DistroInstaller(type = type)
+        installer = virtinst.DistroInstaller(type = type, os_type = os_type)
 
     if (options.pxe and options.location) or (options.location and options.cdrom) or (options.cdrom and options.pxe):
         print >> sys.stderr, _("Only one of --pxe, --location and --cdrom can be used")

virtinst/DistroManager.py

@@ -118,8 +118,8 @@ def acquireBootDisk(baseuri, progresscb, scratchdir="/var/tmp", type=None, distr
         fetcher.cleanupLocation()
 
 class DistroInstaller(Guest.Installer):
-    def __init__(self, type = "xen", location = None, boot = None, extraargs = None):
-        Guest.Installer.__init__(self, type, location, boot, extraargs)
+    def __init__(self, type = "xen", location = None, boot = None, extraargs = None, os_type = None):
+        Guest.Installer.__init__(self, type, location, boot, extraargs, os_type)
 
     def get_location(self):
         return self._location
@@ -177,15 +177,12 @@ def _prepare_kernel_and_initrd(self, guest, distro, meter):
             if not self.extraargs is None:
                 self.install["extraargs"] = self.extraargs
         else:
-            ostype = None
-            if self.type == "xen":
-                ostype = "xen"
             # Need to fetch the kernel & initrd from a remote site, or
             # out of a loopback mounted disk image/device
             (kernelfn, initrdfn, args) = acquireKernel(self.location,
                                                        meter,
                                                        scratchdir = self.scratchdir,
-                                                       type = ostype,
+                                                       type = self.os_type,
                                                        distro = distro)
             self.install["kernel"] = kernelfn
             self.install["initrd"] = initrdfn
@@ -223,15 +220,10 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         if install or hvm:
             osblob = "<os>\n"
 
-            if hvm:
-                type = "hvm"
-            else:
-                type = "linux"
-
             if arch:
-                osblob += "    <type arch='%s'>%s</type>\n" % (arch, type)
+                osblob += "    <type arch='%s'>%s</type>\n" % (arch, self.os_type)
             else:
-                osblob += "    <type>%s</type>\n" % type
+                osblob += "    <type>%s</type>\n" % self.os_type
 
             if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self.install["kernel"])
@@ -269,8 +261,8 @@ def post_install_check(self, guest):
 
 
 class PXEInstaller(Guest.Installer):
-    def __init__(self, type = "xen", location = None, boot = None, extraargs = None):
-        Guest.Installer.__init__(self, type, location, boot, extraargs)
+    def __init__(self, type = "xen", location = None, boot = None, extraargs = None, os_type = None):
+        Guest.Installer.__init__(self, type, location, boot, extraargs, os_type)
 
     def prepare(self, guest, meter, distro = None):
         pass
@@ -280,15 +272,10 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         if install or hvm:
             osblob = "<os>\n"
 
-            if hvm:
-                type = "hvm"
-            else:
-                type = "linux"
-
             if arch:
-                osblob += "    <type arch='%s'>%s</type>\n" % (arch, type)
+                osblob += "    <type arch='%s'>%s</type>\n" % (arch, self.os_type)
             else:
-                osblob += "    <type>%s</type>\n" % type
+                osblob += "    <type>%s</type>\n" % self.os_type
 
             if loader:
                 osblob += "    <loader>%s</loader>\n" % loader

virtinst/Guest.py

@@ -407,11 +407,12 @@ class XenSDLGraphics(SDLVirtualGraphics):
     pass
 
 class Installer(object):
-    def __init__(self, type = "xen", location = None, boot = None, extraargs = None):
+    def __init__(self, type = "xen", location = None, boot = None, extraargs = None, os_type = None):
         self._location = None
         self._extraargs = None
         self._boot = None
         self._cdrom = False
+        self._os_type = os_type
         self._install_disk = None   # VirtualDisk that contains install media
 
         if type is None:
@@ -443,6 +444,12 @@ def set_type(self, val):
         self._type = val
     type = property(get_type, set_type)
 
+    def get_os_type(self):
+        return self._os_type
+    def set_os_type(self, val):
+        self._os_type = val
+    os_type = property(get_os_type, set_os_type)
+
     def get_scratchdir(self):
         if self.type == "xen":
             return "/var/lib/xen"

virtinst/LiveCDInstaller.py

@@ -29,8 +29,8 @@ def __init__(self, msg):
         Exception.__init__(self, msg)
 
 class LiveCDInstaller(Guest.Installer):
-    def __init__(self, type = "xen", location = None):
-        Guest.Installer.__init__(self, type, location)
+    def __init__(self, type = "xen", location = None, os_type = None):
+        Guest.Installer.__init__(self, type, location, os_type = None)
 
     def prepare(self, guest, meter, distro = None):
         self.cleanup()
@@ -59,7 +59,7 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
             return None
 
         osblob  = "<os>\n"
-        osblob += "      <type>hvm</type>\n"
+        osblob += "      <type>%s</type>\n" % self.os_type
         if loader:
             osblob += "      <loader>%s</loader>\n" % loader
         osblob += "      <boot dev='cdrom'/>\n"

virtinst/ParaVirtGuest.py

@@ -30,7 +30,10 @@ def __init__(self, type=None, connection=None, hypervisorURI=None, installer=Non
         if not installer:
             installer = DistroManager.DistroInstaller(type = type)
         Guest.Guest.__init__(self, type, connection, hypervisorURI, installer)
-        self.disknode = "xvd"
+        if self.type == "xen":
+            self.disknode = "xvd"
+        else:
+            self.disknode = "hd"
 
     def _get_osblob(self, install):
         return self.installer._get_osblob(install, hvm = False)