Merge heads

This commit is contained in:
Daniel P. Berrange 2007-03-28 15:48:00 -04:00
commit 7efe03a96f

View File

@ -612,7 +612,7 @@ class vmmCreate(gobject.GObject):
title=_("Creating Virtual Machine"), title=_("Creating Virtual Machine"),
text=_("The virtual machine is now being created. " + \ text=_("The virtual machine is now being created. " + \
"Allocation of disk storage and retrieval of " + \ "Allocation of disk storage and retrieval of " + \
"the installation images may a few minutes " + \ "the installation images may take a few minutes " + \
"to complete.")) "to complete."))
progWin.run() progWin.run()
@ -776,7 +776,7 @@ class vmmCreate(gobject.GObject):
elif page_num == PAGE_TYPE: elif page_num == PAGE_TYPE:
if self.get_config_method() == VM_FULLY_VIRT and not virtinst.util.is_hvm_capable(): if self.get_config_method() == VM_FULLY_VIRT and self.connection.get_type().startswith("Xen") and not virtinst.util.is_hvm_capable():
self._validation_error_box(_("Hardware Support Required"), \ self._validation_error_box(_("Hardware Support Required"), \
_("Your hardware does not appear to support full virtualization. Only paravirtualized guests will be available on this hardware.")) _("Your hardware does not appear to support full virtualization. Only paravirtualized guests will be available on this hardware."))
return False return False