openwrt/upstream - upstream openwrt

	Commit message (Collapse)	Author	Age	Files	Lines
*	missing-macros: add GTKDOC_REBASE macro needed by some newer packages	Jo-Philipp Wich	2011-04-12	1	-0/+1
\| \| \| \| \| \| \|	Signed-off-by: Jochen Friedrich <jochen@scram.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26620 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	Add missing XAW macros	Michael Büsch	2011-01-27	2	-0/+70
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25159 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add as-unaligned-access.m4	Jo-Philipp Wich	2011-01-02	2	-0/+47
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24878 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add as-compiler-flag.m4 and as-version.m4	Jo-Philipp Wich	2011-01-02	3	-0/+145
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24877 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add as-ac-expand.m4	Jo-Philipp Wich	2010-12-29	2	-0/+49
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24846 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: extend fake-gtk-doc-check.m4 (fixes autoreconf in ↵	Jo-Philipp Wich	2010-12-22	3	-1/+28
\| \| \| \| \| \|	orbit2), provide fake-intltool.m4 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24787 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add xmms.m4, from libflac	Jo-Philipp Wich	2010-12-22	2	-0/+155
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24784 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add missing serial numbers, split acc.m4 into ↵	Jo-Philipp Wich	2010-12-22	8	-362/+366
\| \| \| \| \| \|	mfx_acc.m4, mfx_cppflags.m4 and mfx_limits.m4 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24763 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: fix a bunch of underquoted definition warnings in ↵	Jo-Philipp Wich	2010-12-22	3	-16/+16
\| \| \| \| \| \|	various 3rd party macros git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24761 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add more m4 macros from gettext, ossp-js, libmikmod, ↵	Jo-Philipp Wich	2010-12-22	15	-0/+1087
\| \| \| \| \| \|	libdnet git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24757 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] missing-macros: add acc.m4, used by ucl and lzo	Jo-Philipp Wich	2010-12-22	2	-0/+367
\| \| \| \|	git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24756 3c298f89-4303-0410-b956-a3cf2f4a3e73
*	[tools] introduce missing-macros meta package, this will supply needed m4 ↵	Jo-Philipp Wich	2010-12-21	4	-0/+1118
	macros which are used but not shipped by various packages in feeds git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24753 3c298f89-4303-0410-b956-a3cf2f4a3e73

#=========================================================================== # This library is free software; you can redistribute it and/or # modify it under the terms of version 2.1 of the GNU Lesser General Public # License as published by the Free Software Foundation. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #============================================================================ # Copyright (C) 2004, 2005 Mike Wray <mike.wray@hp.com> # Copyright (C) 2005, 2006 XenSource Ltd #============================================================================ """Representation of a single domain. Includes support for domain construction, using open-ended configurations. Author: Mike Wray <mike.wray@hp.com> """ import errno import logging import string import time import threading import os import xen.lowlevel.xc from xen.util import asserts from xen.util.blkif import blkdev_uname_to_file from xen.util import security import balloon import image import sxp import uuid import XendDomain import XendRoot from xen.xend.XendBootloader import bootloader from xen.xend.XendError import XendError, VmError from xen.xend.xenstore.xstransact import xstransact, complete from xen.xend.xenstore.xsutil import GetDomainPath, IntroduceDomain from xen.xend.xenstore.xswatch import xswatch from xen.xend import arch """Shutdown code for poweroff.""" DOMAIN_POWEROFF = 0 """Shutdown code for reboot.""" DOMAIN_REBOOT = 1 """Shutdown code for suspend.""" DOMAIN_SUSPEND = 2 """Shutdown code for crash.""" DOMAIN_CRASH = 3 """Shutdown code for halt.""" DOMAIN_HALT = 4 """Map shutdown codes to strings.""" shutdown_reasons = { DOMAIN_POWEROFF: "poweroff", DOMAIN_REBOOT : "reboot", DOMAIN_SUSPEND : "suspend", DOMAIN_CRASH : "crash", DOMAIN_HALT : "halt" } restart_modes = [ "restart", "destroy", "preserve", "rename-restart" ] STATE_DOM_OK = 1 STATE_DOM_SHUTDOWN = 2 SHUTDOWN_TIMEOUT = 30.0 MIGRATE_TIMEOUT = 30.0 ZOMBIE_PREFIX = 'Zombie-' """Constants for the different stages of ext. device migration """ DEV_MIGRATE_TEST = 0 DEV_MIGRATE_STEP1 = 1 DEV_MIGRATE_STEP2 = 2 DEV_MIGRATE_STEP3 = 3 """Minimum time between domain restarts in seconds.""" MINIMUM_RESTART_TIME = 20 RESTART_IN_PROGRESS = 'xend/restart_in_progress' xc = xen.lowlevel.xc.xc() xroot = XendRoot.instance() log = logging.getLogger("xend.XendDomainInfo") #log.setLevel(logging.TRACE) ## # All parameters of VMs that may be configured on-the-fly, or at start-up. # VM_CONFIG_PARAMS = [ ('name', str), ('on_poweroff', str), ('on_reboot', str), ('on_crash', str), ] ## # Configuration entries that we expect to round-trip -- be read from the # config file or xc, written to save-files (i.e. through sxpr), and reused as # config on restart or restore, all without munging. Some configuration # entries are munged for backwards compatibility reasons, or because they # don't come out of xc in the same form as they are specified in the config # file, so those are handled separately. ROUNDTRIPPING_CONFIG_ENTRIES = [ ('uuid', str), ('vcpus', int), ('vcpu_avail', int), ('cpu_cap', int), ('cpu_weight', int), ('memory', int), ('shadow_memory', int), ('maxmem', int), ('bootloader', str), ('bootloader_args', str), ('features', str), ('localtime', int), ] ROUNDTRIPPING_CONFIG_ENTRIES += VM_CONFIG_PARAMS ## # All entries written to the store. This is VM_CONFIG_PARAMS, plus those # entries written to the store that cannot be reconfigured on-the-fly. # VM_STORE_ENTRIES = [ ('uuid', str), ('vcpus', int), ('vcpu_avail', int), ('memory', int), ('shadow_memory', int), ('maxmem', int), ('start_time', float), ] VM_STORE_ENTRIES += VM_CONFIG_PARAMS # # There are a number of CPU-related fields: # # vcpus: the number of virtual CPUs this domain is configured to use. # vcpu_avail: a bitmap telling the guest domain whether it may use each of # its VCPUs. This is translated to # <dompath>/cpu/<id>/availability = {online,offline} for use # by the guest domain. # cpumap: a list of bitmaps, one for each VCPU, giving the physical # CPUs that that VCPU may use. # cpu: a configuration setting requesting that VCPU 0 is pinned to # the specified physical CPU. # # vcpus and vcpu_avail settings persist with the VM (i.e. they are persistent # across save, restore, migrate, and restart). The other settings are only # specific to the domain, so are lost when the VM moves. # def create(config): """Create a VM from a configuration. @param config configuration @raise: VmError for invalid configuration """ log.debug("XendDomainInfo.create(%s)", config) vm = XendDomainInfo(parseConfig(config)) try: vm.construct() vm.initDomain() vm.storeVmDetails() vm.storeDomDetails() vm.registerWatches() vm.refreshShutdown() return vm except: log.exception('Domain construction failed') vm.destroy() raise def recreate(xeninfo, priv): """Create the VM object for an existing domain. The domain must not be dying, as the paths in the store should already have been removed, and asking us to recreate them causes problems.""" log.debug("XendDomainInfo.recreate(%s)", xeninfo) assert not xeninfo['dying'] domid = xeninfo['dom'] uuid1 = xeninfo['handle'] xeninfo['uuid'] = uuid.toString(uuid1) dompath = GetDomainPath(domid) if not dompath: raise XendError( 'No domain path in store for existing domain %d' % domid) log.info("Recreating domain %d, UUID %s.", domid, xeninfo['uuid']) try: vmpath = xstransact.Read(dompath, "vm") if not vmpath: raise XendError( 'No vm path in store for existing domain %d' % domid) uuid2_str = xstransact.Read(vmpath, "uuid") if not uuid2_str: raise XendError( 'No vm/uuid path in store for existing domain %d' % domid) uuid2 = uuid.fromString(uuid2_str) if uuid1 != uuid2: raise XendError( 'Uuid in store does not match uuid for existing domain %d: ' '%s != %s' % (domid, uuid2_str, xeninfo['uuid'])) vm = XendDomainInfo(xeninfo, domid, dompath, True, priv) except Exception, exn: if priv: log.warn(str(exn)) vm = XendDomainInfo(xeninfo, domid, dompath, True, priv) vm.recreateDom() vm.removeVm() vm.storeVmDetails() vm.storeDomDetails() vm.registerWatches() vm.refreshShutdown(xeninfo) return vm def restore(config): """Create a domain and a VM object to do a restore. @param config: domain configuration """ log.debug("XendDomainInfo.restore(%s)", config) vm = XendDomainInfo(parseConfig(config), None, None, False, False, True) try: vm.construct() vm.storeVmDetails() vm.createDevices() vm.createChannels() vm.storeDomDetails() vm.endRestore() return vm except: vm.destroy() raise def parseConfig(config): def get_cfg(name, conv = None): val = sxp.child_value(config, name) if conv and not val is None: try: return conv(val) except TypeError, exn: raise VmError( 'Invalid setting %s = %s in configuration: %s' % (name, val, str(exn))) else: return val log.debug("parseConfig: config is %s", config) result = {} for e in ROUNDTRIPPING_CONFIG_ENTRIES: result[e[0]] = get_cfg(e[0], e[1]) result['cpu'] = get_cfg('cpu', int) result['cpus'] = get_cfg('cpus', str) result['image'] = get_cfg('image') tmp_security = get_cfg('security') if tmp_security: result['security'] = tmp_security try: if result['image']: v = sxp.child_value(result['image'], 'vcpus') if result['vcpus'] is None and v is not None: result['vcpus'] = int(v) elif v is not None and int(v) != result['vcpus']: log.warn(('Image VCPUs setting overrides vcpus=%d elsewhere.' ' Using %s VCPUs for VM %s.') % (result['vcpus'], v, result['uuid'])) result['vcpus'] = int(v) except TypeError, exn: raise VmError( 'Invalid configuration setting: vcpus = %s: %s' % (sxp.child_value(result['image'], 'vcpus', 1), str(exn))) try: # support legacy config files with 'cpu' parameter # NB: prepending to list to support previous behavior # where 'cpu' parameter pinned VCPU0. if result['cpu']: if result['cpus']: result['cpus'] = "%s,%s" % (str(result['cpu']), result['cpus']) else: result['cpus'] = str(result['cpu']) # convert 'cpus' string to list of ints # 'cpus' supports a list of ranges (0-3), seperated by # commas, and negation, (^1). # Precedence is settled by order of the string: # "0-3,^1" -> [0,2,3] # "0-3,^1,1" -> [0,1,2,3] if result['cpus']: cpus = [] for c in result['cpus'].split(','): if c.find('-') != -1: (x,y) = c.split('-') for i in range(int(x),int(y)+1): cpus.append(int(i)) else: # remove this element from the list if c[0] == '^': cpus = [x for x in cpus if x != int(c[1:])] else: cpus.append(int(c)) result['cpus'] = cpus except ValueError, exn: raise VmError( 'Invalid configuration setting: cpus = %s: %s' % (result['cpus'], exn)) result['backend'] = [] for c in sxp.children(config, 'backend'): result['backend'].append(sxp.name(sxp.child0(c))) result['device'] = [] for d in sxp.children(config, 'device'): c = sxp.child0(d) result['device'].append((sxp.name(c), c)) # Configuration option "restart" is deprecated. Parse it, but # let on_xyz override it if they are present. restart = get_cfg('restart') if restart: def handle_restart(event, val): if result[event] is None: result[event] = val if restart == "onreboot": handle_restart('on_poweroff', 'destroy') handle_restart('on_reboot', 'restart') handle_restart('on_crash', 'destroy') elif restart == "always": handle_restart('on_poweroff', 'restart') handle_restart('on_reboot', 'restart') handle_restart('on_crash', 'restart') elif restart == "never": handle_restart('on_poweroff', 'destroy') handle_restart('on_reboot', 'destroy') handle_restart('on_crash', 'destroy') else: log.warn("Ignoring malformed and deprecated config option " "restart = %s", restart) result['start_time'] = get_cfg('start_time', float) log.debug("parseConfig: result is %s", result) return result def domain_by_name(name): return XendDomain.instance().domain_lookup_by_name_nr(name) def shutdown_reason(code): """Get a shutdown reason from a code. @param code: shutdown code @type code: int @return: shutdown reason @rtype: string """ return shutdown_reasons.get(code, "?") def dom_get(dom): """Get info from xen for an existing domain. @param dom: domain id @return: info or None """ try: domlist = xc.domain_getinfo(dom, 1) if domlist and dom == domlist[0]['dom']: return domlist[0] except Exception, err: # ignore missing domain log.trace("domain_getinfo(%d) failed, ignoring: %s", dom, str(err)) return None class XendDomainInfo: def __init__(self, info, domid = None, dompath = None, augment = False, priv = False, resume = False): self.info = info if not self.infoIsSet('uuid'): self.info['uuid'] = uuid.toString(uuid.create()) if domid is not None: self.domid = domid elif 'dom' in info: self.domid = int(info['dom']) else: self.domid = None self.vmpath = XendDomain.VMROOT + self.info['uuid'] self.dompath = dompath if augment: self.augmentInfo(priv) self.validateInfo() self.image = None self.security = None self.store_port = None self.store_mfn = None self.console_port = None self.console_mfn = None self.vmWatch = None self.shutdownWatch = None self.shutdownStartTime = None self.state = STATE_DOM_OK self.state_updated = threading.Condition() self.refresh_shutdown_lock = threading.Condition() self.setResume(resume) ## private: def readVMDetails(self, params): """Read the specified parameters from the store. """ try: return self.gatherVm(*params) except ValueError: # One of the int/float entries in params has a corresponding store # entry that is invalid. We recover, because older versions of # Xend may have put the entry there (memory/target, for example), # but this is in general a bad situation to have reached. log.exception( "Store corrupted at %s! Domain %d's configuration may be " "affected.", self.vmpath, self.domid) return [] def storeChanged(self, _): log.trace("XendDomainInfo.storeChanged"); changed = False def f(x, y): if y is not None and self.info[x[0]] != y: self.info[x[0]] = y changed = True map(f, VM_CONFIG_PARAMS, self.readVMDetails(VM_CONFIG_PARAMS)) im = self.readVm('image') current_im = self.info['image'] if (im is not None and (current_im is None or sxp.to_string(current_im) != im)): self.info['image'] = sxp.from_string(im) changed = True if changed: # Update the domain section of the store, as this contains some # parameters derived from the VM configuration. self.storeDomDetails() return 1 def augmentInfo(self, priv): """Augment self.info, as given to us through {@link #recreate}, with values taken from the store. This recovers those values known to xend but not to the hypervisor. """ def useIfNeeded(name, val): if not self.infoIsSet(name) and val is not None: self.info[name] = val if priv: entries = VM_STORE_ENTRIES[:] entries.remove(('memory', int)) entries.remove(('maxmem', int)) else: entries = VM_STORE_ENTRIES entries.append(('image', str)) entries.append(('security', str)) map(lambda x, y: useIfNeeded(x[0], y), entries, self.readVMDetails(entries)) device = [] for c in controllerClasses: devconfig = self.getDeviceConfigurations(c) if devconfig: device.extend(map(lambda x: (c, x), devconfig)) useIfNeeded('device', device) def validateInfo(self): """Validate and normalise the info block. This has either been parsed by parseConfig, or received from xc through recreate and augmented by the current store contents. """ def defaultInfo(name, val): if not self.infoIsSet(name): self.info[name] = val() try: defaultInfo('name', lambda: "Domain-%d" % self.domid) defaultInfo('on_poweroff', lambda: "destroy") defaultInfo('on_reboot', lambda: "restart") defaultInfo('on_crash', lambda: "restart") defaultInfo('features', lambda: "") defaultInfo('cpu', lambda: None) defaultInfo('cpus', lambda: []) defaultInfo('cpu_cap', lambda: 0) defaultInfo('cpu_weight', lambda: 256) # some domains don't have a config file (e.g. dom0 ) # to set number of vcpus so we derive available cpus # from max_vcpu_id which is present for running domains. if not self.infoIsSet('vcpus') and self.infoIsSet('max_vcpu_id'): avail = int(self.info['max_vcpu_id'])+1 else: avail = int(1) defaultInfo('vcpus', lambda: avail) defaultInfo('online_vcpus', lambda: self.info['vcpus']) defaultInfo('max_vcpu_id', lambda: self.info['vcpus']-1) defaultInfo('vcpu_avail', lambda: (1 << self.info['vcpus']) - 1) defaultInfo('memory', lambda: 0) defaultInfo('shadow_memory', lambda: 0) defaultInfo('maxmem', lambda: 0) defaultInfo('bootloader', lambda: None) defaultInfo('bootloader_args', lambda: None) defaultInfo('backend', lambda: []) defaultInfo('device', lambda: []) defaultInfo('image', lambda: None) defaultInfo('security', lambda: None) self.check_name(self.info['name']) if isinstance(self.info['image'], str): self.info['image'] = sxp.from_string(self.info['image']) if isinstance(self.info['security'], str): self.info['security'] = sxp.from_string(self.info['security']) if self.info['memory'] == 0: if self.infoIsSet('mem_kb'): self.info['memory'] = (self.info['mem_kb'] + 1023) / 1024 if self.info['memory'] <= 0: raise VmError('Invalid memory size') if self.info['maxmem'] < self.info['memory']: self.info['maxmem'] = self.info['memory'] for (n, c) in self.info['device']: if not n or not c or n not in controllerClasses: raise VmError('invalid device (%s, %s)' % (str(n), str(c))) for event in ['on_poweroff', 'on_reboot', 'on_crash']: if self.info[event] not in restart_modes: raise VmError('invalid restart event: %s = %s' % (event, str(self.info[event]))) except KeyError, exn: log.exception(exn) raise VmError('Unspecified domain detail: %s' % exn) def readVm(self, *args): return xstransact.Read(self.vmpath, *args) def writeVm(self, *args): return xstransact.Write(self.vmpath, *args) def removeVm(self, *args): return xstransact.Remove(self.vmpath, *args) def gatherVm(self, *args): return xstransact.Gather(self.vmpath, *args) ## public: def storeVm(self, *args): return xstransact.Store(self.vmpath, *args) ## private: def readDom(self, *args): return xstransact.Read(self.dompath, *args) def writeDom(self, *args): return xstransact.Write(self.dompath, *args) ## public: def removeDom(self, *args): return xstransact.Remove(self.dompath, *args) def recreateDom(self): complete(self.dompath, lambda t: self._recreateDom(t)) def _recreateDom(self, t): t.remove() t.mkdir() t.set_permissions({ 'dom' : self.domid }) ## private: def storeDom(self, *args): return xstransact.Store(self.dompath, *args) ## public: def completeRestore(self, store_mfn, console_mfn): log.debug("XendDomainInfo.completeRestore") self.store_mfn = store_mfn self.console_mfn = console_mfn self.introduceDomain() self.storeDomDetails() self.registerWatches() self.refreshShutdown() log.debug("XendDomainInfo.completeRestore done") def storeVmDetails(self): to_store = {} for k in VM_STORE_ENTRIES: if self.infoIsSet(k[0]): to_store[k[0]] = str(self.info[k[0]]) if self.infoIsSet('image'): to_store['image'] = sxp.to_string(self.info['image']) if self.infoIsSet('security'): security = self.info['security'] to_store['security'] = sxp.to_string(security) for idx in range(0, len(security)): if security[idx][0] == 'access_control': to_store['security/access_control'] = sxp.to_string([ security[idx][1] , security[idx][2] ]) for aidx in range(1, len(security[idx])): if security[idx][aidx][0] == 'label': to_store['security/access_control/label'] = security[idx][aidx][1] if security[idx][aidx][0] == 'policy': to_store['security/access_control/policy'] = security[idx][aidx][1] if security[idx][0] == 'ssidref': to_store['security/ssidref'] = str(security[idx][1]) if not self.readVm('xend/restart_count'): to_store['xend/restart_count'] = str(0) log.debug("Storing VM details: %s", to_store) self.writeVm(to_store) self.setVmPermissions() def setVmPermissions(self): """Allow the guest domain to read its UUID. We don't allow it to access any other entry, for security.""" xstransact.SetPermissions('%s/uuid' % self.vmpath, { 'dom' : self.domid, 'read' : True, 'write' : False }) def storeDomDetails(self): to_store = { 'domid': str(self.domid), 'vm': self.vmpath, 'name': self.info['name'], 'console/limit': str(xroot.get_console_limit() * 1024), 'memory/target': str(self.info['memory'] * 1024) } def f(n, v): if v is not None: to_store[n] = str(v) f('console/port', self.console_port) f('console/ring-ref', self.console_mfn) f('store/port', self.store_port) f('store/ring-ref', self.store_mfn) to_store.update(self.vcpuDomDetails()) log.debug("Storing domain details: %s", to_store) self.writeDom(to_store) ## private: def vcpuDomDetails(self): def availability(n): if self.info['vcpu_avail'] & (1 << n): return 'online' else: return 'offline' result = {} for v in range(0, self.info['vcpus']):