The v2 is the same to v1, however, it's committed based on latest git repo. The v1 hasn't been committed based on latest git repo due to network issue, so it will exist conflict when applying it. If domain type is 'kvm', the randomMAC() will think it's a invalid key then set default 'xen' type mac address. It's a real error for cloning a kvm guest, the guest mac address will be changed to 'xen' type address. RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=798909 * virtinst/util.py (randomMAC): add 'kvm' domain type. Signed-off-by: Alex Jia <ajia@xxxxxxxxxx> --- virtinst/util.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/virtinst/util.py b/virtinst/util.py index 2977e08..cf0074b 100644 --- a/virtinst/util.py +++ b/virtinst/util.py @@ -204,7 +204,8 @@ def randomMAC(type="xen", conn=None): # Testing hack return "00:11:22:33:44:55" - ouis = { 'xen': [ 0x00, 0x16, 0x3E ], 'qemu': [ 0x52, 0x54, 0x00 ] } + ouis = dict.fromkeys(['qemu', 'kvm'], [ 0x52, 0x54, 0x00 ]) + ouis.update(dict.fromkeys(['xen'], [ 0x00, 0x16, 0x3E ])) try: oui = ouis[type] -- 1.7.1
