summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarvin Liu <yong.liu@intel.com>2015-07-28 08:53:21 +0800
committerMarvin Liu <yong.liu@intel.com>2015-07-28 08:57:22 +0800
commit53405311b0b5dc91c688e4862629cb3036004af6 (patch)
tree48a0109b6c95ce6f12bcfdfa13a0d7cbe5c0b2a4
parent62bae8b88afc00c46bf0a7d8ad9b539c5e6e3dae (diff)
downloaddts-53405311b0b5dc91c688e4862629cb3036004af6.zip
dts-53405311b0b5dc91c688e4862629cb3036004af6.tar.gz
dts-53405311b0b5dc91c688e4862629cb3036004af6.tar.xz
fix bug that vm_dut has no attribute Name
Signed-off-by: Marvin Liu <yong.liu@intel.com>
-rw-r--r--framework/qemu_kvm.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py
index 5df9675..fd4be20 100644
--- a/framework/qemu_kvm.py
+++ b/framework/qemu_kvm.py
@@ -1025,7 +1025,7 @@ class QEMUKvm(VirtBase):
if not self.monitor_sock_path:
self.host_logger.info(
"No monitor between on host [ %s ] for guest [ %s ]" %
- (self.host_dut.Name, self.vm_name))
+ (self.host_dut.NAME, self.vm_name))
return None
self.host_session.send_expect('nc -U %s' % self.monitor_sock_path, '(qemu)', 2)
@@ -1045,10 +1045,14 @@ class QEMUKvm(VirtBase):
pci_reg = r'^.*Bus(\s+)(\d+), device(\s+)(\d+), function (\d+)'
id_reg = r'^.*id \"(.*)\"'
+ pcis = []
out = self.__monitor_session('info', 'pci')
+
+ if out is None:
+ return pcis
+
lines = out.split("\r\n")
- pcis = []
for line in lines:
m = re.match(pci_reg, line)
n = re.match(id_reg, line)
@@ -1076,7 +1080,7 @@ class QEMUKvm(VirtBase):
if not self.qga_sock_path:
self.host_logger.info(
"No QGA service between host [ %s ] and guest [ %s ]" %
- (self.host_dut.Name, self.vm_name))
+ (self.host_dut.NAME, self.vm_name))
return None
cmd_head = '~/QMP/' + \