Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: use libvirtError instance instead of virConnGetLastError

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-05-03 20:22:50 +02:00
parent 13f0f64d0a
commit 6ecc263534
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core-modules/000QubesVm.py
View File

@ -683,8 +683,8 @@ class QubesVm(object):
def xid(self): def xid(self):
try: try:
return self.libvirt_domain.ID() return self.libvirt_domain.ID()
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return -1 return -1
else: else:
raise raise
@ -725,8 +725,8 @@ class QubesVm(object):
if not self.libvirt_domain.isActive(): if not self.libvirt_domain.isActive():
return 0 return 0
return self.libvirt_domain.info()[1] return self.libvirt_domain.info()[1]
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
else: else:
raise raise
@ -739,8 +739,8 @@ class QubesVm(object):
if not self.libvirt_domain.isActive(): if not self.libvirt_domain.isActive():
return 0 return 0
return self.libvirt_domain.info()[4] return self.libvirt_domain.info()[4]
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
else: else:
raise raise
@ -751,8 +751,8 @@ class QubesVm(object):
try: try:
return self.libvirt_domain.maxMemory() return self.libvirt_domain.maxMemory()
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
else: else:
raise raise
@ -780,8 +780,8 @@ class QubesVm(object):
libvirt.VIR_NODE_CPU_STATS_ALL_CPUS, 0)[0]['cpu_time']/10**9 libvirt.VIR_NODE_CPU_STATS_ALL_CPUS, 0)[0]['cpu_time']/10**9
else: else:
return 0 return 0
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return 0 return 0
else: else:
raise raise
@ -819,8 +819,8 @@ class QubesVm(object):
return "Running" return "Running"
else: else:
return 'Halted' return 'Halted'
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return "Halted" return "Halted"
else: else:
raise raise
@ -853,8 +853,8 @@ class QubesVm(object):
return True return True
else: else:
return False return False
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return False return False
else: else:
raise raise
@ -865,8 +865,8 @@ class QubesVm(object):
return True return True
else: else:
return False return False
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_NO_DOMAIN: if e.err[0] == libvirt.VIR_ERR_NO_DOMAIN:
return False return False
else: else:
raise raise
@ -1709,8 +1709,8 @@ class QubesVm(object):
nd = vmm.libvirt_conn.nodeDeviceLookupByName('pci_0000_' + pci.replace(':','_').replace('.','_')) nd = vmm.libvirt_conn.nodeDeviceLookupByName('pci_0000_' + pci.replace(':','_').replace('.','_'))
try: try:
nd.dettach() nd.dettach()
except libvirt.libvirtError: except libvirt.libvirtError as e:
if vmm.libvirt_conn.virConnGetLastError()[0] == libvirt.VIR_ERR_INTERNAL_ERROR: if e.err[0] == libvirt.VIR_ERR_INTERNAL_ERROR:
# allready detached # allready detached
pass pass
else: else: