10:03 a.m.
V2:
- Patch disables vhost feature only in ubuntu 14.04 or lower
V1:
Patch 1 - Disables vhost feature
Patch 2 - Uses/modify SUSE patch from kimchi upstream. Adds SLES and change
RHEL version (6.5) in modern distros dict. Modern distros are going
to use virtio.
Rodrigo Trujillo (2):
Disable vhost feature in Ubuntu LE
Change modern distro versions
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 9 ++++++---
src/kimchi/vmtemplate.py | 10 +++++++++-
3 files changed, 16 insertions(+), 4 deletions(-)
--
1.9.3
10:03 a.m.
New subject: [PATCH 1/2 V2] Disable vhost feature in Ubuntu LE
There are know problems related to vhost feature and Ubunut LE. This
patch sets driver name='qemu', disabling the vhost feature when libvirt
starts a virtual machine.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/kimchi/vmtemplate.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 32d331b..88594b8 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -23,6 +23,9 @@ import socket
import urlparse
+from distutils.version import LooseVersion
+
+
from kimchi import osinfo
from kimchi.exception import InvalidParameter, IsoFormatError
from kimchi.isoinfo import IsoImage
@@ -263,11 +266,16 @@ class VMTemplate(object):
return ret
def _get_networks_xml(self):
+ # Hack to disable vhost feature in Ubuntu LE (PPC)
+ driver = ''
+ if (self.info['os_distro'] == 'ubuntu' and
+ LooseVersion(self.info['os_version']) <=
LooseVersion('14.04')):
+ driver = " <driver name='qemu'/>\n "
network = """
<interface type='network'>
<source network='%(network)s'/>
<model type='%(nic_model)s'/>
- </interface>
+ %(driver)s</interface>
"""
networks = ""
net_info = {"nic_model": self.info['nic_model']}
--
1.9.3
10:03 a.m.
New subject: [PATCH 2/2 V2] Change modern distro versions
This patch adds OpenSuse and SLES to PPC modern distro dictionary.
It also change RHEL version from 7.0 to 6.5.
The original commit is:
"b482880157292cda2247b4b67a67cbe8c6bdf86b, Author: Dinar Valeev
<dvaleev(a)suse.com> - Date: Fri Jul 4 12:51:32"
Modern distros are going to use virtio instead of spapr.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py
index 7867b78..fb69df0 100644
--- a/src/kimchi/isoinfo.py
+++ b/src/kimchi/isoinfo.py
@@ -96,6 +96,7 @@ iso_dir = [
'|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')),
('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'),
('sles', '11', 'SUSE_SLES-11-0-0'),
+ ('sles', '12', 'SLE-12'),
('sles', lambda m: "11sp%s" % m.group(1),
'SLES-11-SP(\d+)'),
('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'),
('opensuse', '11.1', 'SU1110.001'),
diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 245374f..698f2c6 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec,
disk_bus='ide',
modern_version_bases = {'x86': {'debian': '6.0',
'ubuntu': '7.10',
'opensuse': '10.3', 'centos':
'5.3',
- 'rhel': '6.0', 'fedora':
'16', 'gentoo': '0'},
- 'power': {'rhel': '7.0',
'fedora': '19',
- 'ubuntu': '14.04'}}
+ 'rhel': '6.0', 'fedora':
'16', 'gentoo': '0',
+ 'sles': '11'},
+ 'power': {'rhel': '6.5',
'fedora': '19',
+ 'ubuntu': '14.04',
+ 'opensuse': '13.1',
+ 'sles': '11sp3'}}
icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/'
% paths.ui_dir, 'icon-*.png')]
--
1.9.3
10:08 a.m.
Please, ignore this patch set.
On 07/23/2014 12:03 PM, Rodrigo Trujillo wrote:
V2:
- Patch disables vhost feature only in ubuntu 14.04 or lower
V1:
Patch 1 - Disables vhost feature
Patch 2 - Uses/modify SUSE patch from kimchi upstream. Adds SLES and change
RHEL version (6.5) in modern distros dict. Modern distros are going
to use virtio.
Rodrigo Trujillo (2):
Disable vhost feature in Ubuntu LE
Change modern distro versions
src/kimchi/isoinfo.py | 1 +
src/kimchi/osinfo.py | 9 ++++++---
src/kimchi/vmtemplate.py | 10 +++++++++-
3 files changed, 16 insertions(+), 4 deletions(-)
3805
days inactive
3805
days old
3 comments
1 participants
participants (1)
-
Rodrigo Trujillo