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

Remove import xen.lowlevel.xc

Browse Source 
There is still use of it: QubesHost.get_free_xen_memory and
QubesHost.measure_cpu_usage. Will migrate them to libvirt later (for now
some things will be broken - namely qubes-manager).
This commit is contained in:
Marek Marczykowski-Górecki 2013-07-22 04:34:36 +02:00
parent 6193b4fea3
commit bc58ca5edb
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/qubes.py
View File

@ -42,7 +42,6 @@ dry_run = False
if not dry_run: if not dry_run:
import libvirt import libvirt
import xen.lowlevel.xc
import xen.lowlevel.xs import xen.lowlevel.xs
@ -139,7 +138,6 @@ class QubesVMMConnection(object):
# Do not initialize in offline mode # Do not initialize in offline mode
return return
self._xc = xen.lowlevel.xc.xc()
self._xs = xen.lowlevel.xs.xs() self._xs = xen.lowlevel.xs.xs()
self._libvirt_conn = libvirt.open(defaults['libvirt_uri']) self._libvirt_conn = libvirt.open(defaults['libvirt_uri'])
if self._libvirt_conn == None: if self._libvirt_conn == None:
@ -164,10 +162,6 @@ class QubesVMMConnection(object):
def xs(self): def xs(self):
return self._common_getter('_xs') return self._common_getter('_xs')
@property
def xc(self):
return self._common_getter('_xc')
##### VMM global variable definition ##### ##### VMM global variable definition #####
@ -179,8 +173,6 @@ if not dry_run:
class QubesHost(object): class QubesHost(object):
def __init__(self): def __init__(self):
(model, memory, cpus, mhz, nodes, socket, cores, threads) = vmm.libvirt_conn.getInfo() (model, memory, cpus, mhz, nodes, socket, cores, threads) = vmm.libvirt_conn.getInfo()
self.physinfo = vmm.xc.physinfo()
self._total_mem = long(memory)*1024 self._total_mem = long(memory)*1024
self._no_cpus = cpus self._no_cpus = cpus