guest: Drop back compat hugepage attribute

This commit is contained in:
Cole Robinson 2014-03-22 12:25:28 -04:00
parent d1749c614d
commit a5b3c1d2f8
4 changed files with 6 additions and 8 deletions

View File

@ -709,7 +709,7 @@ class TestXMLConfig(unittest.TestCase):
g = utils.get_basic_fullyvirt_guest(installer=i)
g.description = "foooo barrrr somedesc"
g.hugepage = True
g.memoryBacking.hugepages = True
# Hostdevs
dev1 = VirtualHostDevice(g.conn)

View File

@ -114,7 +114,6 @@ class XMLParseTest(unittest.TestCase):
check("uuid", "12345678-1234-1234-1234-123456789012",
"11111111-2222-3333-4444-555555555555")
check("emulator", "/usr/lib/xen/bin/qemu-dm", "/usr/binnnn/fooemu")
check("hugepage", False, True)
check("type", "kvm", "test")
check("bootloader", None, "pygrub")
check("on_poweroff", "destroy", "restart")

View File

@ -1250,7 +1250,7 @@ class ParserMemory(VirtCLIParser):
setattr(inst, cliname, int(val) * 1024)
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("memoryBacking.hugepages", "hugepages", is_onoff=True)
#####################

View File

@ -93,10 +93,10 @@ class Guest(XMLBuilder):
_XML_ROOT_NAME = "domain"
_XML_PROP_ORDER = ["type", "name", "uuid", "title", "description",
"maxmemory", "memory", "hugepage", "vcpus", "curvcpus", "memtune",
"numatune", "blkiotune", "bootloader", "os", "idmap", "features", "cpu",
"clock", "on_poweroff", "on_reboot", "on_crash", "pm", "emulator", "_devices",
"seclabel"]
"maxmemory", "memory", "memoryBacking", "vcpus", "curvcpus", "memtune",
"numatune", "blkiotune", "bootloader", "os", "idmap", "features",
"cpu", "clock", "on_poweroff", "on_reboot", "on_crash", "pm",
"emulator", "_devices", "seclabel"]
def __init__(self, *args, **kwargs):
XMLBuilder.__init__(self, *args, **kwargs)
@ -175,7 +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)
bootloader = XMLProperty("./bootloader")
description = XMLProperty("./description")
title = XMLProperty("./title")