NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2026-08-08 20:18:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

virtinst: cpu: Reorder feature bits to match libvirt XML order

Browse Source
This commit is contained in:
Cole Robinson
2014-01-31 13:44:50 -05:00
parent 90c9b3ca2e
commit 427400d3f3
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/cli-test-xml/compare/kvm-f14-url.xml
+26 -26
View File
@@ -18,19 +18,19 @@
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature name="pbe" policy="require"/>
<feature name="tm2" policy="require"/>
<feature name="est" policy="require"/>
<feature name="ss" policy="require"/>
<feature name="ht" policy="require"/>
<feature name="ds" policy="require"/>
<feature name="lahf_lm" policy="require"/>
<feature name="tm" policy="require"/>
<feature name="cx16" policy="require"/>
<feature name="vmx" policy="require"/>
<feature name="ds_cpl" policy="require"/>
<feature name="xtpr" policy="require"/>
<feature name="acpi" policy="require"/>
<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>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
@@ -87,19 +87,19 @@
<cpu mode="custom" match="exact">
<model>core2duo</model>
<vendor>Intel</vendor>
<feature name="pbe" policy="require"/>
<feature name="tm2" policy="require"/>
<feature name="est" policy="require"/>
<feature name="ss" policy="require"/>
<feature name="ht" policy="require"/>
<feature name="ds" policy="require"/>
<feature name="lahf_lm" policy="require"/>
<feature name="tm" policy="require"/>
<feature name="cx16" policy="require"/>
<feature name="vmx" policy="require"/>
<feature name="ds_cpl" policy="require"/>
<feature name="xtpr" policy="require"/>
<feature name="acpi" policy="require"/>
<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>
<clock offset="utc">
<timer name="rtc" tickpolicy="catchup"/>
tests/cli-test-xml/compare/virtxml-build-cpu.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<cpu mode="custom" match="exact">
<model>pentium3</model>
<feature name="x2apic" policy="force"/>
<feature policy="force" name="x2apic"/>
</cpu>
tests/clitest.py
+1 -4
View File
@@ -33,9 +33,6 @@ from virtinst import support
from tests import virtinstall, virtimage, virtclone, virtconvert, virtxml
from tests import utils
# Enable this to refresh test output
REGENERATE_OUTPUT = False
os.environ["VIRTCONV_TEST_NO_DISK_CONVERSION"] = "1"
os.environ["LANG"] = "en_US.UTF-8"
@@ -257,7 +254,7 @@ class Command(object):
if filename:
# Generate test files that don't exist yet
if REGENERATE_OUTPUT or not os.path.exists(filename):
if utils.REGENERATE_OUTPUT or not os.path.exists(filename):
file(filename, "w").write(output)
utils.diff_compare(output, filename)
tests/utils.py
+5 -2
View File
@@ -28,6 +28,9 @@ from virtinst import VirtualDisk
from virtinst import VirtualGraphics
from virtinst import VirtualVideoDevice
# Enable this to refresh test output
REGENERATE_OUTPUT = False
# pylint: disable=W0212
# Access to protected member, needed to unittest stuff
@@ -204,8 +207,8 @@ def read_file(filename):
def diff_compare(actual_out, filename=None, expect_out=None):
"""Compare passed string output to contents of filename"""
if not expect_out:
#if filename:
# file(filename, "w").write(actual_out)
if not os.path.exists(filename) or REGENERATE_OUTPUT:
file(filename, "w").write(actual_out)
expect_out = read_file(filename)
diff = "".join(difflib.unified_diff(expect_out.splitlines(1),
tests/xmlconfig-xml/boot-cpuset.xml
+2 -2
View File
@@ -17,8 +17,8 @@
<model>footest</model>
<vendor>Intel</vendor>
<topology sockets="4" cores="5" threads="2"/>
<feature name="x2apic" policy="force"/>
<feature name="lahf_lm" policy="forbid"/>
<feature policy="force" name="x2apic"/>
<feature policy="forbid" name="lahf_lm"/>
</cpu>
<clock offset="utc"/>
<on_poweroff>destroy</on_poweroff>
tests/xmlparse-xml/change-guest-out.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<feature policy="disable" name="x2apic"/>
<feature policy="forbid" name="lahf_lm"/>
<feature policy="optional" name="cr8legacy"/>
<feature name="addfeature" policy="require"/>
<feature policy="require" name="addfeature"/>
</cpu>
<clock offset="localtime">
<timer name="rtc" tickpolicy="merge"/>
tests/xmlparse-xml/change-minimal-guest-out.xml
+1 -1
View File
@@ -25,6 +25,6 @@
<cpu mode="custom" match="exact">
<model>foobar</model>
<topology sockets="1" cores="4" threads="1"/>
<feature name="x2apic" policy="forbid"/>
<feature policy="forbid" name="x2apic"/>
</cpu>
</domain>
virtinst/cpu.py
+1 -1
View File
@@ -28,7 +28,7 @@ class CPUFeature(XMLBuilder):
POLICIES = ["force", "require", "optional", "disable", "forbid"]
_XML_ROOT_NAME = "feature"
_XML_PROP_ORDER = ["name", "policy"]
_XML_PROP_ORDER = ["policy", "name"]
name = XMLProperty("./@name")
policy = XMLProperty("./@policy")