From 06547846436ae8eaa89af2440e9abea438df5d6a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 2 Feb 2014 16:12:29 -0500 Subject: [PATCH] virt-install: Add --pm option --- man/virt-install.pod | 7 +++++ man/virt-xml.pod | 2 ++ tests/cli-test-xml/compare/many-devices.xml | 8 ++++++ .../compare/virtxml-edit-simple-pm.xml | 12 +++++++++ tests/clitest.py | 2 ++ tests/testdriver.xml | 5 ++++ tests/utils.py | 2 +- tests/xmlparse-xml/change-guest-in.xml | 3 +++ tests/xmlparse-xml/change-guest-out.xml | 4 +++ tests/xmlparse.py | 4 +++ virtinst/__init__.py | 1 + virtinst/cli.py | 15 +++++++++++ virtinst/guest.py | 4 ++- virtinst/pm.py | 27 +++++++++++++++++++ 14 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 tests/cli-test-xml/compare/virtxml-edit-simple-pm.xml create mode 100644 virtinst/pm.py diff --git a/man/virt-install.pod b/man/virt-install.pod index 615fa8be..711d657d 100644 --- a/man/virt-install.pod +++ b/man/virt-install.pod @@ -238,6 +238,13 @@ might be catchup, delay, etc. Refer to the libvirt docs for all values. Use --clock=? to see a list of all available sub options. Complete details at L +=item --pm=PMOPTS + +Configure guest power management features. Example suboptions include suspend_to_ram=on|off and suspend_to_disk=on|off + +Use --pm=? to see a list of all available sub options. Complete details at L + + =back diff --git a/man/virt-xml.pod b/man/virt-xml.pod index 1c015f5f..9a488b45 100644 --- a/man/virt-xml.pod +++ b/man/virt-xml.pod @@ -188,6 +188,8 @@ Before defining or updating the domain, show the generated XML diff and interact =item --clock +=item --pm + =item --boot =item --filesystem diff --git a/tests/cli-test-xml/compare/many-devices.xml b/tests/cli-test-xml/compare/many-devices.xml index a0d9d435..9df07df5 100644 --- a/tests/cli-test-xml/compare/many-devices.xml +++ b/tests/cli-test-xml/compare/many-devices.xml @@ -28,6 +28,10 @@ destroy destroy destroy + + + + /usr/bin/test-hv @@ -147,6 +151,10 @@ destroy restart restart + + + + /usr/bin/test-hv diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-pm.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-pm.xml new file mode 100644 index 00000000..cc0c12ee --- /dev/null +++ b/tests/cli-test-xml/compare/virtxml-edit-simple-pm.xml @@ -0,0 +1,12 @@ + restart + restart + +- ++ ++ + + + /usr/lib/xen/bin/qemu-dm + +Domain 'test-many-devices' defined successfully. +Changes will take effect after the next domain shutdown. \ No newline at end of file diff --git a/tests/clitest.py b/tests/clitest.py index 5ff593bf..3ccd5826 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -566,6 +566,7 @@ c.add_compare("""--hvm --pxe \ --host-device net_00_1c_25_10_b1_e4 \ --features acpi=off,eoi=on,privnet=on,hyperv_spinlocks=on,hyperv_spinlocks_retries=1234 \ --clock offset=localtime,hpet_present=no,rtc_tickpolicy=merge \ +--pm suspend_to_mem=yes,suspend_to_disk=no \ """, "many-devices") # Lots of devices c.add_valid("--hvm --disk path=virt-install,device=cdrom") # Specifying cdrom media via --disk c.add_valid("--hvm --import --disk path=virt-install") # FV Import install @@ -800,6 +801,7 @@ c.add_compare("--boot loader=foo.bar,network,useserial=on,init=/bin/bash", "virt c.add_compare("--security label=foo,bar,baz,UNKNOWN=val,relabel=on", "virtxml-edit-simple-security") c.add_compare("--features eoi=on,hyperv_relaxed=off,acpi=", "virtxml-edit-simple-features") c.add_compare("--clock offset=localtime,hpet_present=yes,kvmclock_present=no,rtc_tickpolicy=merge", "virtxml-edit-simple-clock") +c.add_compare("--pm suspend_to_mem=yes,suspend_to_disk=no", "virtxml-edit-simple-pm") c.add_compare("--disk /dev/zero,perms=ro,startup_policy=optional", "virtxml-edit-simple-disk") c.add_compare("--disk path=", "virtxml-edit-simple-disk-remove-path") c.add_compare("--network source=br0,type=bridge,model=virtio,mac=", "virtxml-edit-simple-network") diff --git a/tests/testdriver.xml b/tests/testdriver.xml index 1c3a7370..e2bfd13b 100644 --- a/tests/testdriver.xml +++ b/tests/testdriver.xml @@ -108,6 +108,11 @@ + + + + + /usr/lib/xen/bin/qemu-dm diff --git a/tests/utils.py b/tests/utils.py index d15e2767..989c6922 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -29,7 +29,7 @@ from virtinst import VirtualGraphics from virtinst import VirtualVideoDevice # Enable this to refresh test output -REGENERATE_OUTPUT = False +REGENERATE_OUTPUT = True # pylint: disable=W0212 # Access to protected member, needed to unittest stuff diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml index 0514dcce..4d12e610 100644 --- a/tests/xmlparse-xml/change-guest-in.xml +++ b/tests/xmlparse-xml/change-guest-in.xml @@ -33,6 +33,9 @@ destroy restart restart + + + 5 /usr/lib/xen/bin/qemu-dm diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml index 80a34f0d..c11c20bc 100644 --- a/tests/xmlparse-xml/change-guest-out.xml +++ b/tests/xmlparse-xml/change-guest-out.xml @@ -37,6 +37,10 @@ restart destroy destroy + + + + 12 /usr/binnnn/fooemu diff --git a/tests/xmlparse.py b/tests/xmlparse.py index 5f82365e..d49fb4a2 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -133,6 +133,10 @@ class XMLParseTest(unittest.TestCase): check("name", None, "hpet") check("present", None, False) + check = self._make_checker(guest.pm) + check("suspend_to_mem", False, True) + check("suspend_to_disk", None, False) + check = self._make_checker(guest.seclabel) check("type", "static", "static") check("model", "selinux", "apparmor") diff --git a/virtinst/__init__.py b/virtinst/__init__.py index a6a905ff..6c849755 100644 --- a/virtinst/__init__.py +++ b/virtinst/__init__.py @@ -29,6 +29,7 @@ from virtinst.domainnumatune import DomainNumatune from virtinst.clock import Clock from virtinst.cpu import CPU, CPUFeature from virtinst.seclabel import Seclabel +from virtinst.pm import PM import virtinst.capabilities as CapabilitiesParser from virtinst.interface import Interface, InterfaceProtocol diff --git a/virtinst/cli.py b/virtinst/cli.py index 8b233d99..cc74af83 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -943,6 +943,7 @@ def add_guest_xml_options(geng): geng.add_argument("--clock", help=_("Set domain XML. Ex:\n" "--clock offset=localtime,rtc_tickpolicy=catchup")) + geng.add_argument("--pm", help=_("Config power management features")) def add_boot_option(insg): @@ -1615,6 +1616,18 @@ class ParserClock(VirtCLIParser): self.set_param(None, tname + "_tickpolicy", setter_cb=set_timer) +################ +# --pm parsing # +################ + +class ParserPM(VirtCLIParser): + def _init_params(self): + self.clear_attr = "pm" + + self.set_param("pm.suspend_to_mem", "suspend_to_mem", is_onoff=True) + self.set_param("pm.suspend_to_disk", "suspend_to_disk", is_onoff=True) + + ########################## # Guest parsing # ########################## @@ -2222,6 +2235,8 @@ def build_parser_map(options, skip=None, only=None): register_parser("security", ParserSecurity) register_parser("features", ParserFeatures) register_parser("clock", ParserClock) + register_parser("pm", ParserPM) + register_parser("features", ParserFeatures) register_parser("disk", ParserDisk) register_parser("network", ParserNetwork) register_parser("graphics", ParserGraphics) diff --git a/virtinst/guest.py b/virtinst/guest.py index c50bc03d..f7130350 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -36,6 +36,7 @@ from virtinst import Seclabel from virtinst import CPU from virtinst import DomainNumatune from virtinst import DomainFeatures +from virtinst import PM from virtinst.xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty from virtinst import osdict @@ -90,7 +91,7 @@ class Guest(XMLBuilder): _XML_PROP_ORDER = ["type", "name", "uuid", "title", "description", "maxmemory", "memory", "hugepage", "vcpus", "curvcpus", "numatune", "bootloader", "os", "features", "cpu", "clock", - "on_poweroff", "on_reboot", "on_crash", "emulator", "_devices", + "on_poweroff", "on_reboot", "on_crash", "pm", "emulator", "_devices", "seclabel"] def __init__(self, *args, **kwargs): @@ -183,6 +184,7 @@ class Guest(XMLBuilder): seclabel = XMLChildProperty(Seclabel, is_single=True) cpu = XMLChildProperty(CPU, is_single=True) numatune = XMLChildProperty(DomainNumatune, is_single=True) + pm = XMLChildProperty(PM, is_single=True) ############################### diff --git a/virtinst/pm.py b/virtinst/pm.py new file mode 100644 index 00000000..a8b5a2b2 --- /dev/null +++ b/virtinst/pm.py @@ -0,0 +1,27 @@ +# +# Copyright 2014 Red Hat, Inc. +# Cole Robinson +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. + +from virtinst.xmlbuilder import XMLBuilder, XMLProperty + + +class PM(XMLBuilder): + _XML_ROOT_NAME = "pm" + + suspend_to_mem = XMLProperty("./suspend-to-mem/@enabled", is_yesno=True) + suspend_to_disk = XMLProperty("./suspend-to-disk/@enabled", is_yesno=True)