[virt-tools-list] [virt-manager][PATCH 3/3] Modify the machine type for s390x.All machine types begin with "s390x-ccw" will by set to the default machine type "s390-ccw-virtio".

[Cole Robinson]

On 11/04/2015 10:12 PM, Kevin Zhao wrote:
> Hi Cole ,
> Thanks for merging my patch.
> I choose to check for the prefix because that the next version of KVMIBM may
> change the machine type,they are not always have the machine type
> "s390-ccw-virtio ", so I preserve the checking for the machine type.
> 

So KVMIBM doesn't advertise a s390-ccw-virtio machine type, but it accepts it?
Then that's a bug on their side, or in the libvirt handling. Tools should
never have to know some magic machine type that isn't advertised in the
libvirt capabilities XML. So I think you fix this on the KVMIBM side

- Cole

> On 2015年11月05日 03:53, Cole Robinson wrote:
>> On 11/04/2015 01:30 AM, Kevin Zhao wrote:
>>> a5a467fddcb8---
>>>   virtinst/capabilities.py | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
>>> index 4fa1724..10e7ea0 100644
>>> --- a/virtinst/capabilities.py
>>> +++ b/virtinst/capabilities.py
>>> @@ -364,7 +364,7 @@ class _CapsInfo(object):
>>>                   return "vexpress-a15"
>>>             if self.arch in ["s390x"]:
>>> -            if "s390-ccw-virtio" in self.machines:
>>> +            if any(machine.startswith("s390-ccw") for machine in
>>> self.machines):
>>>                   return "s390-ccw-virtio"
>>>             return None
>>>
>> Is this still needed? The capabilities XML you added to the test suite has the
>> proper s390-ccw-virtio mapping value... why do we need to check for the
>> s390-ccw prefix, and not the actual value we are going to specify in the XML?
>>
>> - Cole
>>
>