9:51 a.m.
This patchset makes necessary changes to check and change in PPC:
- memory and maxMemory must be aligned to 256 MiB
- Number of slots must be <= 32
Rodrigo Trujillo (2):
Check memory alignment in PowerPC to 256MiB
Check and align number of memory slot to 32 in PowerPC
src/wok/plugins/kimchi/i18n.py | 1 +
src/wok/plugins/kimchi/model/vms.py | 33 +++++++++++++++++++++++++++++++++
src/wok/plugins/kimchi/osinfo.py | 4 ++++
src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
4 files changed, 44 insertions(+), 1 deletion(-)
--
2.1.0
9:51 a.m.
New subject: [PATCH 1/2] Check memory alignment in PowerPC to 256MiB
QEMU for Power requires memory aligned to 256MiB.
This patch makes the checking and changes if necessary.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/plugins/kimchi/i18n.py | 1 +
src/wok/plugins/kimchi/model/vms.py | 25 +++++++++++++++++++++++++
src/wok/plugins/kimchi/osinfo.py | 4 ++++
3 files changed, 30 insertions(+)
diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py
index 42a5e16..9fb4edc 100644
--- a/src/wok/plugins/kimchi/i18n.py
+++ b/src/wok/plugins/kimchi/i18n.py
@@ -115,6 +115,7 @@ messages = {
"KCHVM0058E": _("Failed to migrate virtual machine %(name)s due error:
%(err)s"),
"KCHVM0059E": _("User name of the remote server must be a
string."),
"KCHVM0060E": _("Destination host of the migration must be a
string."),
+ "KCHVM0061E": _("Memory value %(mem)s must be aligned to
256MiB."),
"KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned
host device %(dev_name)s."),
"KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to
directly assign to VM."),
diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py
index 0641ae8..3965906 100644
--- a/src/wok/plugins/kimchi/model/vms.py
+++ b/src/wok/plugins/kimchi/model/vms.py
@@ -21,6 +21,7 @@ import copy
import libvirt
import lxml.etree as ET
import os
+import platform
import random
import socket
import string
@@ -232,6 +233,13 @@ class VMModel(object):
vm_locks[name] = lock
with lock:
+ # make sure memory is alingned in 256MiB
+ distro, _, _ = platform.linux_distribution()
+ if 'memory' in params and distro == "IBM_PowerKVM":
+ if params['memory'] % 256 != 0:
+ raise InvalidParameter('KCHVM0061E',
+ {'mem':
str(params['memory'])})
+
dom = self.get_vm(name, self.conn)
vm_name, dom = self._static_vm_update(name, dom, params)
self._live_vm_update(dom, params)
@@ -800,6 +808,17 @@ class VMModel(object):
raise OperationFailed("KCHVM0041E")
elif slots == 0:
slots = 1
+
+ force_max_mem_update = False
+ distro, _, _ = platform.linux_distribution()
+ if distro == "IBM_PowerKVM":
+ # max memory 256MiB alignment
+ host_mem -= (host_mem % 256)
+ # force max memory update if it exists but it's wrong.
+ if maxMem is not None and\
+ int(maxMem.text) != (host_mem * 1024):
+ force_max_mem_update = True
+
if maxMem is None:
max_mem_xml = E.maxMemory(
str(host_mem * 1024),
@@ -813,6 +832,12 @@ class VMModel(object):
'./maxMemory',
str(slots),
attr='slots')
+
+ if force_max_mem_update:
+ new_xml = xml_item_update(new_xml,
+ './maxMemory',
+ str(host_mem * 1024))
+
return new_xml
return ET.tostring(root, encoding="utf-8")
diff --git a/src/wok/plugins/kimchi/osinfo.py b/src/wok/plugins/kimchi/osinfo.py
index 75a21ff..c915e6d 100644
--- a/src/wok/plugins/kimchi/osinfo.py
+++ b/src/wok/plugins/kimchi/osinfo.py
@@ -204,6 +204,10 @@ def lookup(distro, version):
# set up arch to ppc64 instead of ppc64le due to libvirt compatibility
if params["arch"] == "ppc64le":
params["arch"] = "ppc64"
+ # in Power, memory must be aligned in 256MiB
+ if (params['max_memory'] / 1024) % 256 != 0:
+ alignment = params['max_memory'] % (256 * 1024)
+ params['max_memory'] -= alignment
if distro in modern_version_bases[arch]:
if LooseVersion(version) >= LooseVersion(
--
2.1.0
1:18 p.m.
New subject: [PATCH 1/2] Check memory alignment in PowerPC to 256MiB
My suggestion is to put the '256' in a variable/function inside
osinfo.py for
example and then use it across the code. Hardcoding the alignment in the
code
will make it harder to change it later, if required.
You can even use this variable as a input in the error message of i18n.py,
making it adaptable.
On 11/10/2015 01:51 PM, Rodrigo Trujillo wrote:
QEMU for Power requires memory aligned to 256MiB.
This patch makes the checking and changes if necessary.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/plugins/kimchi/i18n.py | 1 +
src/wok/plugins/kimchi/model/vms.py | 25 +++++++++++++++++++++++++
src/wok/plugins/kimchi/osinfo.py | 4 ++++
3 files changed, 30 insertions(+)
diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py
index 42a5e16..9fb4edc 100644
--- a/src/wok/plugins/kimchi/i18n.py
+++ b/src/wok/plugins/kimchi/i18n.py
@@ -115,6 +115,7 @@ messages = {
"KCHVM0058E": _("Failed to migrate virtual machine %(name)s due
error: %(err)s"),
"KCHVM0059E": _("User name of the remote server must be a
string."),
"KCHVM0060E": _("Destination host of the migration must be a
string."),
+ "KCHVM0061E": _("Memory value %(mem)s must be aligned to
256MiB."),
"KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned
host device %(dev_name)s."),
"KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to
directly assign to VM."),
diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py
index 0641ae8..3965906 100644
--- a/src/wok/plugins/kimchi/model/vms.py
+++ b/src/wok/plugins/kimchi/model/vms.py
@@ -21,6 +21,7 @@ import copy
import libvirt
import lxml.etree as ET
import os
+import platform
import random
import socket
import string
@@ -232,6 +233,13 @@ class VMModel(object):
vm_locks[name] = lock
with lock:
+ # make sure memory is alingned in 256MiB
+ distro, _, _ = platform.linux_distribution()
+ if 'memory' in params and distro == "IBM_PowerKVM":
+ if params['memory'] % 256 != 0:
+ raise InvalidParameter('KCHVM0061E',
+ {'mem':
str(params['memory'])})
+
dom = self.get_vm(name, self.conn)
vm_name, dom = self._static_vm_update(name, dom, params)
self._live_vm_update(dom, params)
@@ -800,6 +808,17 @@ class VMModel(object):
raise OperationFailed("KCHVM0041E")
elif slots == 0:
slots = 1
+
+ force_max_mem_update = False
+ distro, _, _ = platform.linux_distribution()
+ if distro == "IBM_PowerKVM":
+ # max memory 256MiB alignment
+ host_mem -= (host_mem % 256)
+ # force max memory update if it exists but it's wrong.
+ if maxMem is not None and\
+ int(maxMem.text) != (host_mem * 1024):
+ force_max_mem_update = True
+
if maxMem is None:
max_mem_xml = E.maxMemory(
str(host_mem * 1024),
@@ -813,6 +832,12 @@ class VMModel(object):
'./maxMemory',
str(slots),
attr='slots')
+
+ if force_max_mem_update:
+ new_xml = xml_item_update(new_xml,
+ './maxMemory',
+ str(host_mem * 1024))
+
return new_xml
return ET.tostring(root, encoding="utf-8")
diff --git a/src/wok/plugins/kimchi/osinfo.py b/src/wok/plugins/kimchi/osinfo.py
index 75a21ff..c915e6d 100644
--- a/src/wok/plugins/kimchi/osinfo.py
+++ b/src/wok/plugins/kimchi/osinfo.py
@@ -204,6 +204,10 @@ def lookup(distro, version):
# set up arch to ppc64 instead of ppc64le due to libvirt compatibility
if params["arch"] == "ppc64le":
params["arch"] = "ppc64"
+ # in Power, memory must be aligned in 256MiB
+ if (params['max_memory'] / 1024) % 256 != 0:
+ alignment = params['max_memory'] % (256 * 1024)
+ params['max_memory'] -= alignment
if distro in modern_version_bases[arch]:
if LooseVersion(version) >= LooseVersion(
6:23 a.m.
New subject: [PATCH 1/2] Check memory alignment in PowerPC to 256MiB
ok, thanks, makes sense
On 11/10/2015 05:18 PM, Daniel Henrique Barboza wrote:
My suggestion is to put the '256' in a variable/function
inside
osinfo.py for
example and then use it across the code. Hardcoding the alignment in
the code
will make it harder to change it later, if required.
You can even use this variable as a input in the error message of
i18n.py,
making it adaptable.
On 11/10/2015 01:51 PM, Rodrigo Trujillo wrote:
> QEMU for Power requires memory aligned to 256MiB.
> This patch makes the checking and changes if necessary.
>
> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
> ---
> src/wok/plugins/kimchi/i18n.py | 1 +
> src/wok/plugins/kimchi/model/vms.py | 25 +++++++++++++++++++++++++
> src/wok/plugins/kimchi/osinfo.py | 4 ++++
> 3 files changed, 30 insertions(+)
>
> diff --git a/src/wok/plugins/kimchi/i18n.py
> b/src/wok/plugins/kimchi/i18n.py
> index 42a5e16..9fb4edc 100644
> --- a/src/wok/plugins/kimchi/i18n.py
> +++ b/src/wok/plugins/kimchi/i18n.py
> @@ -115,6 +115,7 @@ messages = {
> "KCHVM0058E": _("Failed to migrate virtual machine %(name)s due
> error: %(err)s"),
> "KCHVM0059E": _("User name of the remote server must be a
> string."),
> "KCHVM0060E": _("Destination host of the migration must be a
> string."),
> + "KCHVM0061E": _("Memory value %(mem)s must be aligned to
256MiB."),
> "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly
> assigned host device %(dev_name)s."),
> "KCHVMHDEV0002E": _("The host device %(dev_name)s is not
> allowed to directly assign to VM."),
> diff --git a/src/wok/plugins/kimchi/model/vms.py
> b/src/wok/plugins/kimchi/model/vms.py
> index 0641ae8..3965906 100644
> --- a/src/wok/plugins/kimchi/model/vms.py
> +++ b/src/wok/plugins/kimchi/model/vms.py
> @@ -21,6 +21,7 @@ import copy
> import libvirt
> import lxml.etree as ET
> import os
> +import platform
> import random
> import socket
> import string
> @@ -232,6 +233,13 @@ class VMModel(object):
> vm_locks[name] = lock
> with lock:
> + # make sure memory is alingned in 256MiB
> + distro, _, _ = platform.linux_distribution()
> + if 'memory' in params and distro == "IBM_PowerKVM":
> + if params['memory'] % 256 != 0:
> + raise InvalidParameter('KCHVM0061E',
> + {'mem':
> str(params['memory'])})
> +
> dom = self.get_vm(name, self.conn)
> vm_name, dom = self._static_vm_update(name, dom, params)
> self._live_vm_update(dom, params)
> @@ -800,6 +808,17 @@ class VMModel(object):
> raise OperationFailed("KCHVM0041E")
> elif slots == 0:
> slots = 1
> +
> + force_max_mem_update = False
> + distro, _, _ = platform.linux_distribution()
> + if distro == "IBM_PowerKVM":
> + # max memory 256MiB alignment
> + host_mem -= (host_mem % 256)
> + # force max memory update if it exists but it's wrong.
> + if maxMem is not None and\
> + int(maxMem.text) != (host_mem * 1024):
> + force_max_mem_update = True
> +
> if maxMem is None:
> max_mem_xml = E.maxMemory(
> str(host_mem * 1024),
> @@ -813,6 +832,12 @@ class VMModel(object):
> './maxMemory',
> str(slots),
> attr='slots')
> +
> + if force_max_mem_update:
> + new_xml = xml_item_update(new_xml,
> + './maxMemory',
> + str(host_mem * 1024))
> +
> return new_xml
> return ET.tostring(root, encoding="utf-8")
> diff --git a/src/wok/plugins/kimchi/osinfo.py
> b/src/wok/plugins/kimchi/osinfo.py
> index 75a21ff..c915e6d 100644
> --- a/src/wok/plugins/kimchi/osinfo.py
> +++ b/src/wok/plugins/kimchi/osinfo.py
> @@ -204,6 +204,10 @@ def lookup(distro, version):
> # set up arch to ppc64 instead of ppc64le due to libvirt
> compatibility
> if params["arch"] == "ppc64le":
> params["arch"] = "ppc64"
> + # in Power, memory must be aligned in 256MiB
> + if (params['max_memory'] / 1024) % 256 != 0:
> + alignment = params['max_memory'] % (256 * 1024)
> + params['max_memory'] -= alignment
> if distro in modern_version_bases[arch]:
> if LooseVersion(version) >= LooseVersion(
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
9:51 a.m.
New subject: [PATCH 2/2] Check and align number of memory slot to 32 in PowerPC
This patch checks the number os memory slots needed in PowerPC and
raises an error if > 32, or set it to 32.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/plugins/kimchi/model/vms.py | 8 ++++++++
src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py
index 3965906..401cfc6 100644
--- a/src/wok/plugins/kimchi/model/vms.py
+++ b/src/wok/plugins/kimchi/model/vms.py
@@ -819,6 +819,10 @@ class VMModel(object):
int(maxMem.text) != (host_mem * 1024):
force_max_mem_update = True
+ # max 32 slots on Power
+ if slots > 32:
+ slots = 32
+
if maxMem is None:
max_mem_xml = E.maxMemory(
str(host_mem * 1024),
@@ -877,6 +881,10 @@ class VMModel(object):
# New memory value is same that current memory set
return
+ distro, _, _ = platform.linux_distribution()
+ if distro == "IBM_PowerKVM" and needed_slots > 32:
+ raise OperationFailed('KCHVM0045E')
+
# Finally, we are ok to hot add the memory devices
try:
self._hot_add_memory_devices(dom, needed_slots)
diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py
index 283d94d..4556ee6 100644
--- a/src/wok/plugins/kimchi/vmtemplate.py
+++ b/src/wok/plugins/kimchi/vmtemplate.py
@@ -328,13 +328,18 @@ class VMTemplate(object):
# Setting maximum number of slots to avoid errors when hotplug memory
# Number of slots are the numbers of chunks of 1GB that fit inside
- # the max_memory of the host minus memory assigned to the VM
+ # the max_memory of the host minus memory assigned to the VM. It
+ # cannot have more than 32 slots in Power.
params['slots'] = ((params['max_memory'] >> 10) -
params['memory']) >> 10
if params['slots'] < 0:
raise OperationFailed("KCHVM0041E")
elif params['slots'] == 0:
params['slots'] = 1
+ elif params['slots'] > 32:
+ distro, _, _ = platform.linux_distribution()
+ if distro == "IBM_PowerKVM":
+ params['slots'] = 32
xml = """
<domain type='%(domain)s'>
--
2.1.0
10:40 a.m.
If I'm not wrong I sent a patch some time ago to address these problems.
The code was pretty much the same thing but I'm not finding it.
On 10-11-2015 10:51, Rodrigo Trujillo wrote:
This patchset makes necessary changes to check and change in PPC:
- memory and maxMemory must be aligned to 256 MiB
- Number of slots must be <= 32
Rodrigo Trujillo (2):
Check memory alignment in PowerPC to 256MiB
Check and align number of memory slot to 32 in PowerPC
src/wok/plugins/kimchi/i18n.py | 1 +
src/wok/plugins/kimchi/model/vms.py | 33 +++++++++++++++++++++++++++++++++
src/wok/plugins/kimchi/osinfo.py | 4 ++++
src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
4 files changed, 44 insertions(+), 1 deletion(-)
--
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM
11:21 a.m.
On 10/11/2015 14:40, Jose Ricardo Ziviani wrote:
If I'm not wrong I sent a patch some time ago to address these
problems. The code was pretty much the same thing but I'm not finding it.
Ziviani, has the patch been merged? Or is it pending on ML? Could you
provide references to it?
On 10-11-2015 10:51, Rodrigo Trujillo wrote:
> This patchset makes necessary changes to check and change in PPC:
> - memory and maxMemory must be aligned to 256 MiB
> - Number of slots must be <= 32
>
> Rodrigo Trujillo (2):
> Check memory alignment in PowerPC to 256MiB
> Check and align number of memory slot to 32 in PowerPC
>
> src/wok/plugins/kimchi/i18n.py | 1 +
> src/wok/plugins/kimchi/model/vms.py | 33
> +++++++++++++++++++++++++++++++++
> src/wok/plugins/kimchi/osinfo.py | 4 ++++
> src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
> 4 files changed, 44 insertions(+), 1 deletion(-)
>
11:50 a.m.
I can assert that, whatever we have upstream ATM, it does not work in
pkvm. The
memory alignment problem is still happening using upstream Kimchi.
On 11/10/2015 03:21 PM, Aline Manera wrote:
On 10/11/2015 14:40, Jose Ricardo Ziviani wrote:
> If I'm not wrong I sent a patch some time ago to address these
> problems. The code was pretty much the same thing but I'm not finding
> it.
>
Ziviani, has the patch been merged? Or is it pending on ML? Could you
provide references to it?
> On 10-11-2015 10:51, Rodrigo Trujillo wrote:
>> This patchset makes necessary changes to check and change in PPC:
>> - memory and maxMemory must be aligned to 256 MiB
>> - Number of slots must be <= 32
>>
>> Rodrigo Trujillo (2):
>> Check memory alignment in PowerPC to 256MiB
>> Check and align number of memory slot to 32 in PowerPC
>>
>> src/wok/plugins/kimchi/i18n.py | 1 +
>> src/wok/plugins/kimchi/model/vms.py | 33
>> +++++++++++++++++++++++++++++++++
>> src/wok/plugins/kimchi/osinfo.py | 4 ++++
>> src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
>> 4 files changed, 44 insertions(+), 1 deletion(-)
>>
>
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
12:28 p.m.
On 10-11-2015 12:21, Aline Manera wrote:
On 10/11/2015 14:40, Jose Ricardo Ziviani wrote:
> If I'm not wrong I sent a patch some time ago to address these
> problems. The code was pretty much the same thing but I'm not finding it.
>
Ziviani, has the patch been merged? Or is it pending on ML? Could you
provide references to it?
It is not upstream, my mistake. I was really sure it was already merged.
> On 10-11-2015 10:51, Rodrigo Trujillo wrote:
>> This patchset makes necessary changes to check and change in PPC:
>> - memory and maxMemory must be aligned to 256 MiB
>> - Number of slots must be <= 32
>>
>> Rodrigo Trujillo (2):
>> Check memory alignment in PowerPC to 256MiB
>> Check and align number of memory slot to 32 in PowerPC
>>
>> src/wok/plugins/kimchi/i18n.py | 1 +
>> src/wok/plugins/kimchi/model/vms.py | 33
>> +++++++++++++++++++++++++++++++++
>> src/wok/plugins/kimchi/osinfo.py | 4 ++++
>> src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
>> 4 files changed, 44 insertions(+), 1 deletion(-)
>>
>
--
Jose Ricardo Ziviani
-----------------------------
Software Engineer
Linux Technology Center - IBM
12:34 p.m.
I think you sent to PowerKVM only =]
Trujillo
On 11/10/2015 04:28 PM, Jose Ricardo Ziviani wrote:
On 10-11-2015 12:21, Aline Manera wrote:
>
>
> On 10/11/2015 14:40, Jose Ricardo Ziviani wrote:
>> If I'm not wrong I sent a patch some time ago to address these
>> problems. The code was pretty much the same thing but I'm not
>> finding it.
>>
>
> Ziviani, has the patch been merged? Or is it pending on ML? Could you
> provide references to it?
It is not upstream, my mistake. I was really sure it was already merged.
>
>> On 10-11-2015 10:51, Rodrigo Trujillo wrote:
>>> This patchset makes necessary changes to check and change in PPC:
>>> - memory and maxMemory must be aligned to 256 MiB
>>> - Number of slots must be <= 32
>>>
>>> Rodrigo Trujillo (2):
>>> Check memory alignment in PowerPC to 256MiB
>>> Check and align number of memory slot to 32 in PowerPC
>>>
>>> src/wok/plugins/kimchi/i18n.py | 1 +
>>> src/wok/plugins/kimchi/model/vms.py | 33
>>> +++++++++++++++++++++++++++++++++
>>> src/wok/plugins/kimchi/osinfo.py | 4 ++++
>>> src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
>>> 4 files changed, 44 insertions(+), 1 deletion(-)
>>>
>>
>
1:20 p.m.
The contribution fails the make check-local verification in my laptop:
[danielhb@arthas kimchi]$ git am \[Kimchi-devel\]\ \[PATCH\ *
Applying: Check memory alignment in PowerPC to 256MiB
Applying: Check and align number of memory slot to 32 in PowerPC
[danielhb@arthas kimchi]$ make check-local
contrib/check_i18n.py ./i18n.py
Checking for invalid i18n string...
Checking for invalid i18n string successfully
find . -path './.git' -prune -type f -o \
-name '*.py' -o -name '*.py.in' | xargs /usr/bin/pyflakes | \
while read LINE; do echo "$LINE"; false; done
./vmtemplate.py:340: undefined name 'platform'
Makefile:1035: recipe for target 'check-local' failed
make: *** [check-local] Error 1
[danielhb@arthas kimchi]$
And it causes extra errors/failures running the unit tests, probably because
of the above error. Without yours patches in a pkvm box, running upstream
kimchi:
FAILED (failures=11, errors=10, skipped=7)
With your patches:
FAILED (failures=23, errors=29, skipped=7)
Fixing the import error will surely bring the failures down.
Daniel
On 11/10/2015 01:51 PM, Rodrigo Trujillo wrote:
This patchset makes necessary changes to check and change in PPC:
- memory and maxMemory must be aligned to 256 MiB
- Number of slots must be <= 32
Rodrigo Trujillo (2):
Check memory alignment in PowerPC to 256MiB
Check and align number of memory slot to 32 in PowerPC
src/wok/plugins/kimchi/i18n.py | 1 +
src/wok/plugins/kimchi/model/vms.py | 33 +++++++++++++++++++++++++++++++++
src/wok/plugins/kimchi/osinfo.py | 4 ++++
src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
4 files changed, 44 insertions(+), 1 deletion(-)
6:24 a.m.
Oh, thanks Daniel, will fix this
On 11/10/2015 05:20 PM, Daniel Henrique Barboza wrote:
The contribution fails the make check-local verification in my
laptop:
[danielhb@arthas kimchi]$ git am \[Kimchi-devel\]\ \[PATCH\ *
Applying: Check memory alignment in PowerPC to 256MiB
Applying: Check and align number of memory slot to 32 in PowerPC
[danielhb@arthas kimchi]$ make check-local
contrib/check_i18n.py ./i18n.py
Checking for invalid i18n string...
Checking for invalid i18n string successfully
find . -path './.git' -prune -type f -o \
-name '*.py' -o -name '*.py.in' | xargs /usr/bin/pyflakes | \
while read LINE; do echo "$LINE"; false; done
./vmtemplate.py:340: undefined name 'platform'
Makefile:1035: recipe for target 'check-local' failed
make: *** [check-local] Error 1
[danielhb@arthas kimchi]$
And it causes extra errors/failures running the unit tests, probably
because
of the above error. Without yours patches in a pkvm box, running upstream
kimchi:
FAILED (failures=11, errors=10, skipped=7)
With your patches:
FAILED (failures=23, errors=29, skipped=7)
Fixing the import error will surely bring the failures down.
Daniel
On 11/10/2015 01:51 PM, Rodrigo Trujillo wrote:
> This patchset makes necessary changes to check and change in PPC:
> - memory and maxMemory must be aligned to 256 MiB
> - Number of slots must be <= 32
>
> Rodrigo Trujillo (2):
> Check memory alignment in PowerPC to 256MiB
> Check and align number of memory slot to 32 in PowerPC
>
> src/wok/plugins/kimchi/i18n.py | 1 +
> src/wok/plugins/kimchi/model/vms.py | 33
> +++++++++++++++++++++++++++++++++
> src/wok/plugins/kimchi/osinfo.py | 4 ++++
> src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++-
> 4 files changed, 44 insertions(+), 1 deletion(-)
>
_______________________________________________
Kimchi-devel mailing list
Kimchi-devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
3086
days inactive
3088
days old
11 comments
4 participants
participants (4)
-
Aline Manera -
Daniel Henrique Barboza -
Jose Ricardo Ziviani -
Rodrigo Trujillo