From patchwork Fri Feb 18 23:11:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 574191 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1INBQKa009251 for ; Fri, 18 Feb 2011 23:11:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754520Ab1BRXLQ (ORCPT ); Fri, 18 Feb 2011 18:11:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52696 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005Ab1BRXLP (ORCPT ); Fri, 18 Feb 2011 18:11:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1INBEd5030792 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Feb 2011 18:11:14 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1INBDd1011567; Fri, 18 Feb 2011 18:11:13 -0500 Received: from qu0061.eng.lab.tlv.redhat.com ([10.35.16.61]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p1INBCTQ028535; Fri, 18 Feb 2011 18:11:12 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 1/2] KVM test: make_qemu_command(): properly deal with get_mac_address() failure Date: Sat, 19 Feb 2011 01:11:27 +0200 Message-Id: <1298070688-12228-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 18 Feb 2011 23:11:26 +0000 (UTC) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 969558b..d852784 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -638,7 +638,10 @@ class VM: except IndexError: netdev_id = None # Handle the '-net nic' part - mac = vm.get_mac_address(vlan) + try: + mac = vm.get_mac_address(vlan) + except VMAddressError: + mac = None qemu_cmd += add_nic(help, vlan, nic_params.get("nic_model"), mac, netdev_id, nic_params.get("nic_extra_params")) # Handle the '-net tap' or '-net user' part