shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-26 17:25:22 +03:00
Code Issues Projects Releases Wiki Activity

virt-install: Switch --cpu host to use host-model, not copy (bz 1133155)

Browse Source 
host-model offers us other protections now, like ensuring we don't try
to use a host cpu feature that qemu doesn't support.

http://bugzilla.redhat.com/show_bug.cgi?id=1133155
This commit is contained in:
Cole Robinson 2014-09-20 20:40:14 -04:00
parent 64106230bd
commit eda5eea549
3 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/cli-test-xml/compare/virt-install-kvm-f14-url.xml
View File

@ -15,23 +15,7 @@
<apic/>
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature policy="require" name="pbe"/>
<feature policy="require" name="tm2"/>
<feature policy="require" name="est"/>
<feature policy="require" name="ss"/>
<feature policy="require" name="ht"/>
<feature policy="require" name="ds"/>
<feature policy="require" name="lahf_lm"/>
<feature policy="require" name="tm"/>
<feature policy="require" name="cx16"/>
<feature policy="require" name="vmx"/>
<feature policy="require" name="ds_cpl"/>
<feature policy="require" name="xtpr"/>
<feature policy="require" name="acpi"/>
</cpu>
<cpu mode="host-model"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>
@ -84,23 +68,7 @@
<apic/>
<pae/>
</features>
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature policy="require" name="pbe"/>
<feature policy="require" name="tm2"/>
<feature policy="require" name="est"/>
<feature policy="require" name="ss"/>
<feature policy="require" name="ht"/>
<feature policy="require" name="ds"/>
<feature policy="require" name="lahf_lm"/>
<feature policy="require" name="tm"/>
<feature policy="require" name="cx16"/>
<feature policy="require" name="vmx"/>
<feature policy="require" name="ds_cpl"/>
<feature policy="require" name="xtpr"/>
<feature policy="require" name="acpi"/>
</cpu>
<cpu mode="host-model"/>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
<timer name="pit" tickpolicy="delay"/>

3
tests/clitest.py
View File

@ -452,7 +452,7 @@ c.add_valid("--vcpus 4,cores=1") # Topology auto-fill
c.add_valid("--vcpus sockets=2,threads=2") # Topology only
c.add_valid("--cpu somemodel") # Simple --cpu
c.add_valid("--cpu foobar,+x2apic,+x2apicagain,-distest,forbid=foo,forbid=bar,disable=distest2,optional=opttest,require=reqtest,match=strict,vendor=meee") # Crazy --cpu
c.add_valid("--numatune 1,2,3,5-7,^6") # Simple --numatune
c.add_valid("--cpu host --numatune 1,2,3,5-7,^6") # Simple --numatune
c.add_valid("--numatune 1-3,4,mode=strict") # More complex, parser should do the right thing here
c.add_valid("--blkiotune weight=100,device_path=/home/test/1.img,device_weight=200") # --blkiotune
c.add_valid("--memtune hard_limit=10,soft_limit=20,swap_hard_limit=30,min_guarantee=40") # --memtune
@ -462,7 +462,6 @@ c.add_valid("--resource partition=/virtualmachines/production") # --resource
c.add_compare("--connect %(DEFAULTURI)s --cpuset auto --vcpus 2", "cpuset-auto") # --cpuset=auto actually works
c.add_invalid("--vcpus 32 --cpuset=969-1000") # Bogus cpuset
c.add_invalid("--vcpus 32 --cpuset=autofoo") # Bogus cpuset
c.add_invalid("--cpu host") # --cpu host, but no host CPU in caps
c.add_invalid("--clock foo_tickpolicy=merge") # Unknown timer

2
virtinst/cli.py
View File

@ -1213,7 +1213,7 @@ class ParserCPU(VirtCLIParser):
ignore = opts
ignore = cliname
if val == "host":
val = inst.cpu.SPECIAL_MODE_HOST_COPY
val = inst.cpu.SPECIAL_MODE_HOST_MODEL
if val == "none":
val = inst.cpu.SPECIAL_MODE_CLEAR