diff options
| author | Chen Hanxiao <chenhanxiao@cn.fujitsu.com> | 2014-03-22 18:15:45 +0800 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2014-03-22 12:16:24 -0400 |
| commit | 58a07d04fbc4ce240769b9732a577111f6ccd001 (patch) | |
| tree | 1400a4041b34b6b6571b33fbef307022da4aeae3 | |
| parent | 8562c3258e83cef5fe8f24386be58e73c8eda813 (diff) | |
| download | virt-manager-58a07d04fbc4ce240769b9732a577111f6ccd001.tar.gz | |
remove memoryBacking parameters from --memory
Remove some "Memory Backing" parameters from --memory,
and keep 'hugepages' for backward compatibility.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
| -rw-r--r-- | tests/clitest.py | 1 | ||||
| -rw-r--r-- | tests/xmlparse-xml/change-guest-out.xml | 2 | ||||
| -rw-r--r-- | tests/xmlparse.py | 2 | ||||
| -rw-r--r-- | virtinst/cli.py | 2 | ||||
| -rw-r--r-- | virtinst/guest.py | 2 |
5 files changed, 0 insertions, 9 deletions
diff --git a/tests/clitest.py b/tests/clitest.py index e36122c6..6ba9a484 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -470,7 +470,6 @@ c.add_valid("--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 -c.add_valid("--memory 500,maxmemory=1000,hugepages=off,nosharepages=yes,locked=yes") # --memory nosharepages,locked c.add_valid("--idmap uid_start=0,uid_target=1000,uid_count=10,gid_start=0,gid_target=1000,gid_count=10") # --idmap 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 diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml index 5b1a12be..43e58eb7 100644 --- a/tests/xmlparse-xml/change-guest-out.xml +++ b/tests/xmlparse-xml/change-guest-out.xml @@ -80,8 +80,6 @@ <description>Hey desc changed&</description> <memoryBacking> <hugepages/> - <nosharepages/> - <locked/> </memoryBacking> <memtune> <hard_limit>2048</hard_limit> diff --git a/tests/xmlparse.py b/tests/xmlparse.py index 13edff19..8f592b67 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -115,8 +115,6 @@ class XMLParseTest(unittest.TestCase): "11111111-2222-3333-4444-555555555555") check("emulator", "/usr/lib/xen/bin/qemu-dm", "/usr/binnnn/fooemu") check("hugepage", False, True) - check("nosharepages", False, True) - check("locked", False, True) check("type", "kvm", "test") check("bootloader", None, "pygrub") check("on_poweroff", "destroy", "restart") diff --git a/virtinst/cli.py b/virtinst/cli.py index efed4e3d..41d6a8c1 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -1248,8 +1248,6 @@ class ParserMemory(VirtCLIParser): self.set_param("memory", "memory", setter_cb=set_memory_cb) self.set_param("maxmemory", "maxmemory", setter_cb=set_memory_cb) self.set_param("hugepage", "hugepages", is_onoff=True) - self.set_param("nosharepages", "nosharepages", is_onoff=True) - self.set_param("locked", "locked", is_onoff=True) ##################### diff --git a/virtinst/guest.py b/virtinst/guest.py index 9986865e..c7af16f9 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -175,8 +175,6 @@ class Guest(XMLBuilder): id = XMLProperty("./@id", is_int=True) type = XMLProperty("./@type", default_cb=lambda s: "xen") hugepage = XMLProperty("./memoryBacking/hugepages", is_bool=True) - nosharepages = XMLProperty("./memoryBacking/nosharepages", is_bool=True) - locked = XMLProperty("./memoryBacking/locked", is_bool=True) bootloader = XMLProperty("./bootloader") description = XMLProperty("./description") title = XMLProperty("./title") |