shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-28 11:55:06 +03:00
Code Issues Projects Releases Wiki Activity

virt-install: Make '--cpu none' work with aarch64

Browse Source
This commit is contained in:
Cole Robinson 2015-03-23 17:46:09 -04:00
parent 08a72a4aec
commit cfe9e7dc7e
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -16,9 +16,6 @@
<apic/>
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>cortex-a57</model>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
@ -62,9 +59,6 @@
<apic/>
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>cortex-a57</model>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

2
tests/clitest.py
View File

@ -762,7 +762,7 @@ c.add_compare("--arch armv7l --machine virt --boot kernel=/f19-arm.kernel,initrd
c.add_compare("--arch armv7l --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,kernel_args=\"console=ttyAMA0,1234 rw root=/dev/vda3\",extra_args=foo --disk %(EXISTIMG1)s --os-variant fedora20", "arm-defaultmach-f20")
c.add_compare("--arch aarch64 --machine virt --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,kernel_args=\"console=ttyAMA0,1234 rw root=/dev/vda3\",extra_args=foo --disk %(EXISTIMG1)s", "aarch64-machvirt")
c.add_compare("--arch aarch64 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,kernel_args=\"console=ttyAMA0,1234 rw root=/dev/vda3\",extra_args=foo --disk %(EXISTIMG1)s", "aarch64-machdefault")
c.add_compare("--arch aarch64 --cdrom %(EXISTIMG2)s --boot loader=CODE.fd,nvram_template=VARS.fd --disk %(EXISTIMG1)s", "aarch64-cdrom")
c.add_compare("--arch aarch64 --cdrom %(EXISTIMG2)s --boot loader=CODE.fd,nvram_template=VARS.fd --disk %(EXISTIMG1)s --cpu none", "aarch64-cdrom")
c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-pseries-f20")
c.add_compare("--arch ppc64 --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-machdefault-f20")
c.add_compare("--arch aarch64 --nodisks", "aarch64-default-uefi") # ensure aarch64 defaults to UEFI

8
virtinst/guest.py
View File

@ -786,7 +786,8 @@ class Guest(XMLBuilder):
if not self.conn.is_test() and not self.conn.is_qemu():
return
if self.cpu.get_xml_config().strip():
if (self.cpu.get_xml_config().strip() or
self.cpu.special_mode_was_set):
# User already configured CPU
return
@ -802,11 +803,6 @@ class Guest(XMLBuilder):
elif self.os.is_x86() and self.type == "kvm":
if self.os.arch != self.conn.caps.host.cpu.arch:
return
# We need this check to handle the user setting --cpu none on
# the CLI to override our defaults
if self.cpu.special_mode_was_set:
return
self.cpu.set_special_mode(self.x86_cpu_default)
def _hv_supported(self):