summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2014-03-22 12:28:23 -0400
committerCole Robinson <crobinso@redhat.com>2014-03-22 12:28:23 -0400
commit9050998028d89048044345b140710a219f89ca8d (patch)
tree362b0c9213da53afbc4a7605f3c324f4d6057a0e
parenta5b3c1d2f86cf60539b1fc6e6f5d82d9d496d5c1 (diff)
downloadvirt-manager-9050998028d89048044345b140710a219f89ca8d.tar.gz
cli: Rename --membacking to --memorybacking
More consistent with the existing --memory option, and the XML block name.
-rw-r--r--man/virt-install.pod4
-rw-r--r--tests/clitest.py2
-rw-r--r--virtinst/cli.py8
3 files changed, 7 insertions, 7 deletions
diff --git a/man/virt-install.pod b/man/virt-install.pod
index fef3a47b..22252c71 100644
--- a/man/virt-install.pod
+++ b/man/virt-install.pod
@@ -100,11 +100,11 @@ like 'maxmemory' and 'hugepages'. This deprecates the -r/--ram option.
Use --memory=? to see a list of all available sub options. Complete details at L<http://libvirt.org/formatdomain.html#elementsMemoryAllocation>
-=item --membacking OPT1=yes|no[,OPT2=yes|no][...]
+=item --memorybacking OPT1=yes|no[,OPT2=yes|no][...]
This option will influence how virtual memory pages are backed by host pages.
-Use --membacking=? to see a list of all available sub options. Complete details at L<http://libvirt.org/formatdomain.html#elementsMemoryBacking>
+Use --memorybacking=? to see a list of all available sub options. Complete details at L<http://libvirt.org/formatdomain.html#elementsMemoryBacking>
=item --arch=ARCH
diff --git a/tests/clitest.py b/tests/clitest.py
index 926064f0..501146c0 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -470,7 +470,7 @@ 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("--membacking hugepages=yes,nosharepages=yes,locked=yes") # --membacking nosharepages,locked
+c.add_valid("--memorybacking hugepages=yes,nosharepages=yes,locked=yes") # --memorybacking 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/virtinst/cli.py b/virtinst/cli.py
index 31124af6..777dea30 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -786,9 +786,9 @@ def add_guest_xml_options(geng):
help=_("Tune memory policy for the domain process."))
geng.add_argument("--blkiotune", action="append",
help=_("Tune blkio policy for the domain process."))
- geng.add_argument("--membacking", action="append",
+ geng.add_argument("--memorybacking", action="append",
help=_("Set memory backing policy for the domain process. Ex:\n"
- "--membacking hugepages=on"))
+ "--memorybacking hugepages=on"))
geng.add_argument("--features",
help=_("Set domain <features> XML. Ex:\n"
"--features acpi=off\n"
@@ -2038,7 +2038,7 @@ class ParserBlkiotune(VirtCLIParser):
########################
-# --membacking parsing #
+# --memorybacking parsing #
########################
class ParserMemorybacking(VirtCLIParser):
@@ -2216,7 +2216,7 @@ def build_parser_map(options, skip=None, only=None):
register_parser("cpu", ParserCPU)
register_parser("numatune", ParserNumatune)
register_parser("blkiotune", ParserBlkiotune)
- register_parser("membacking", ParserMemorybacking)
+ register_parser("memorybacking", ParserMemorybacking)
register_parser("idmap", ParserIdmap)
register_parser("boot", ParserBoot)
register_parser("security", ParserSecurity)