diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-07 23:03:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-07 23:03:11 +0000 |
| commit | 70f0ea588e9b0ddf47c15531b86e81aa59556199 (patch) | |
| tree | 70a80f382d45675ad9a473c7635f18498fb86ee8 | |
| parent | 4242b6883ec0181e9dcfca6721824d637bb83f5d (diff) | |
| parent | 4170a91f45563060ea5f0c414713646fc7372e88 (diff) | |
| download | nova-70f0ea588e9b0ddf47c15531b86e81aa59556199.tar.gz nova-70f0ea588e9b0ddf47c15531b86e81aa59556199.tar.xz nova-70f0ea588e9b0ddf47c15531b86e81aa59556199.zip | |
Merge "Remove the <acpi/> feature from UML/LXC guests"
| -rw-r--r-- | nova/virt/libvirt.xml.template | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template index 1272dc7a3..ef024c3dd 100644 --- a/nova/virt/libvirt.xml.template +++ b/nova/virt/libvirt.xml.template @@ -51,9 +51,11 @@ #end if #end if </os> +#if $type != 'lxc' and $type != 'uml' <features> <acpi/> </features> +#end if <vcpu>${vcpus}</vcpu> <devices> #if $type == 'lxc' |