From: Dan Magenheimer Subject: [PATCH] new nomigrate config option Date: Mon, 19 Oct 2009 15:11:28 -0700 (PDT) Message-ID: <64eba563-acdf-4733-a454-d74c604752ae@default> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__12559902924723382abhmt020.oracle.com" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "Xen-Devel (E-mail)" List-Id: xen-devel@lists.xenproject.org --__12559902924723382abhmt020.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Add nomigrate config option to disable migration/restore The new nomigrate option can be set to non-zero in vm.cfg (for both hvm and pvm) to disallow a guest from being migrated or restored. (Save is still allowed for the purpose of checkpointing.) The option persists into a save file and is also communicated into the hypervisor, the latter for the purposes of a to-be-added hypercall for communicating to guests that migration is disallowed (which will be used initially for userland TSC-related sensing, but may find other uses). Signed-off-by: Dan Magenheimer diff -r ea34183c5c11 tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/libxc/xc_domain.c=09Mon Oct 19 15:50:06 2009 -0600 @@ -472,6 +472,15 @@ int xc_domain_set_tsc_native(int xc_hand domctl.cmd =3D XEN_DOMCTL_set_tsc_native; domctl.domain =3D (domid_t)domid; domctl.u.set_tsc_native.is_native =3D is_native; + return do_domctl(xc_handle, &domctl); +} + +int xc_domain_disable_migrate(int xc_handle, uint32_t domid) +{ + DECLARE_DOMCTL; + domctl.cmd =3D XEN_DOMCTL_disable_migrate; + domctl.domain =3D (domid_t)domid; + domctl.u.disable_migrate.disable =3D 1; return do_domctl(xc_handle, &domctl); } =20 diff -r ea34183c5c11 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/libxc/xenctrl.h=09Mon Oct 19 15:50:06 2009 -0600 @@ -629,6 +629,8 @@ int xc_domain_set_time_offset(int xc_han int32_t time_offset_seconds); =20 int xc_domain_set_tsc_native(int xc_handle, uint32_t domid, int is_native)= ; + +int xc_domain_disable_migrate(int xc_handle, uint32_t domid); =20 int xc_domain_memory_increase_reservation(int xc_handle, uint32_t domid, diff -r ea34183c5c11 tools/python/xen/lowlevel/xc/xc.c --- a/tools/python/xen/lowlevel/xc/xc.c=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/python/xen/lowlevel/xc/xc.c=09Mon Oct 19 15:50:06 2009 -0600 @@ -1479,6 +1479,20 @@ static PyObject *pyxc_domain_set_tsc_nat return NULL; =20 if (xc_domain_set_tsc_native(self->xc_handle, dom, is_native) !=3D 0) + return pyxc_error_to_exception(); + + Py_INCREF(zero); + return zero; +} + +static PyObject *pyxc_domain_disable_migrate(XcObject *self, PyObject *arg= s) +{ + uint32_t dom; + + if (!PyArg_ParseTuple(args, "i", &dom)) + return NULL; + + if (xc_domain_disable_migrate(self->xc_handle, dom) !=3D 0) return pyxc_error_to_exception(); =20 Py_INCREF(zero); @@ -2015,6 +2029,13 @@ static PyMethodDef pyxc_methods[] =3D { " is_native [int]: 1=3Dnative, 0=3Demulate.\n" "Returns: [int] 0 on success; -1 on error.\n" }, =20 + { "domain_disable_migrate", + (PyCFunction)pyxc_domain_disable_migrate, + METH_VARARGS, "\n" + "Marks domain as non-migratable AND non-restoreable\n" + " dom [int]: Domain whose TSC mode is being set.\n" + "Returns: [int] 0 on success; -1 on error.\n" }, + { "domain_send_trigger", (PyCFunction)pyxc_domain_send_trigger, METH_VARARGS | METH_KEYWORDS, "\n" diff -r ea34183c5c11 tools/python/xen/xend/XendCheckpoint.py --- a/tools/python/xen/xend/XendCheckpoint.py=09Mon Oct 19 13:31:21 2009 +0= 100 +++ b/tools/python/xen/xend/XendCheckpoint.py=09Mon Oct 19 15:50:06 2009 -0= 600 @@ -226,6 +226,19 @@ def restore(xd, fd, dominfo =3D None, paus else: dominfo =3D xd.restore_(vmconfig) =20 + image_cfg =3D dominfo.info.get('image', {}) + is_hvm =3D dominfo.info.is_hvm() + + if is_hvm: + nomigrate =3D dominfo.info['platform'].get('nomigrate', 0) + else: + nomigrate =3D dominfo.info['platform'].get('nomigrate') + if nomigrate is None: + nomigrate =3D 0 + if int(nomigrate) !=3D 0: + dominfo.destroy() + raise XendError("cannot restore non-migratable domain") + # repin domain vcpus if a target node number was specified=20 # this is done prior to memory allocation to aide in memory # distribution for NUMA systems. @@ -248,8 +261,6 @@ def restore(xd, fd, dominfo =3D None, paus assert console_port =20 # if hvm, pass mem size to calculate the store_mfn - image_cfg =3D dominfo.info.get('image', {}) - is_hvm =3D dominfo.info.is_hvm() if is_hvm: apic =3D int(dominfo.info['platform'].get('apic', 0)) pae =3D int(dominfo.info['platform'].get('pae', 0)) diff -r ea34183c5c11 tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/python/xen/xend/XendConfig.py=09Mon Oct 19 15:50:06 2009 -0600 @@ -146,6 +146,7 @@ XENAPI_PLATFORM_CFG_TYPES =3D { 'localtime': int, 'monitor': int, 'nographic': int, + 'nomigrate': int, 'pae' : int, 'rtc_timeoffset': int, 'serial': str, @@ -478,6 +479,9 @@ class XendConfig(dict): =20 if 'tsc_native' not in self['platform']: self['platform']['tsc_native'] =3D 0 + + if 'nomigrate' not in self['platform']: + self['platform']['nomigrate'] =3D 0 =20 if self.is_hvm(): if 'timer_mode' not in self['platform']: diff -r ea34183c5c11 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py=09Mon Oct 19 13:31:21 2009 +0= 100 +++ b/tools/python/xen/xend/XendDomainInfo.py=09Mon Oct 19 15:50:06 2009 -0= 600 @@ -2421,7 +2421,7 @@ class XendDomainInfo: s3_integrity =3D self.info['s3_integrity'] =20 oos =3D self.info['platform'].get('oos', 1) - oos_off =3D 1 - oos + oos_off =3D 1 - int(oos) =20 flags =3D (int(hvm) << 0) | (int(hap) << 1) | (int(s3_integrity) <= < 2) | (int(oos_off) << 3) =20 @@ -2463,6 +2463,11 @@ class XendDomainInfo: viridian =3D self.info["platform"].get("viridian") if arch.type =3D=3D "x86" and hvm and viridian is not None: xc.hvm_set_param(self.domid, HVM_PARAM_VIRIDIAN, long(viridian= )) + + # If nomigrate is set, disable migration + nomigrate =3D self.info["platform"].get("nomigrate") + if arch.type =3D=3D "x86" and nomigrate is not None and long(nomig= rate) !=3D 0: + xc.domain_disable_migrate(self.domid) =20 # Optionally enable virtual HPET hpet =3D self.info["platform"].get("hpet") diff -r ea34183c5c11 tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/python/xen/xm/create.py=09Mon Oct 19 15:50:06 2009 -0600 @@ -224,6 +224,10 @@ gopts.var('tsc_native', val=3D'TSC_NATIVE' gopts.var('tsc_native', val=3D'TSC_NATIVE', fn=3Dset_int, default=3D0, use=3D"""TSC mode (0=3Demulate TSC, 1=3Dnative TSC).""") + +gopts.var('nomigrate', val=3D'NOMIGRATE', + fn=3Dset_int, default=3D0, + use=3D"""migratability (0=3Dmigration enabled, 1=3Dmigration dis= abled).""") =20 gopts.var('vpt_align', val=3D'VPT_ALIGN', fn=3Dset_int, default=3D1, @@ -737,6 +741,9 @@ def configure_image(vals): if vals.tsc_native is not None: config_image.append(['tsc_native', vals.tsc_native]) =20 + if vals.nomigrate is not None: + config_image.append(['nomigrate', vals.nomigrate]) + return config_image =20 def configure_disks(config_devs, vals): @@ -1020,7 +1027,7 @@ def make_config(vals): config.append([n, v]) =20 map(add_conf, ['name', 'memory', 'maxmem', 'shadow_memory', - 'restart', 'on_poweroff', 'tsc_native', + 'restart', 'on_poweroff', 'tsc_native', 'nomigrate', 'on_reboot', 'on_crash', 'vcpus', 'vcpu_avail', 'featur= es', 'on_xend_start', 'on_xend_stop', 'target', 'cpuid', 'cpuid_check', 'machine_address_size', 'suppress_spurio= us_page_faults']) diff -r ea34183c5c11 tools/python/xen/xm/xenapi_create.py --- a/tools/python/xen/xm/xenapi_create.py=09Mon Oct 19 13:31:21 2009 +0100 +++ b/tools/python/xen/xm/xenapi_create.py=09Mon Oct 19 15:50:06 2009 -0600 @@ -1079,6 +1079,7 @@ class sxp2xml: 'xen_platform_pci', 'tsc_native' 'description', + 'nomigrate' ] =20 platform_configs =3D [] diff -r ea34183c5c11 xen/arch/x86/domain.c --- a/xen/arch/x86/domain.c=09Mon Oct 19 13:31:21 2009 +0100 +++ b/xen/arch/x86/domain.c=09Mon Oct 19 15:50:06 2009 -0600 @@ -521,6 +521,9 @@ int arch_domain_create(struct domain *d, } =20 spin_lock_init(&d->arch.vtsc_lock); + + if ( d->domain_id =3D=3D 0 ) + d->disable_migrate =3D 1; =20 return 0; =20 diff -r ea34183c5c11 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c=09Mon Oct 19 13:31:21 2009 +0100 +++ b/xen/arch/x86/domctl.c=09Mon Oct 19 15:50:06 2009 -0600 @@ -1100,6 +1100,24 @@ long arch_do_domctl( } break; =20 + case XEN_DOMCTL_disable_migrate: + { + struct domain *d; + + ret =3D -ESRCH; + d =3D rcu_lock_domain_by_id(domctl->domain); + if ( d =3D=3D NULL ) + break; + + domain_pause(d); + d->arch.disable_migrate =3D domctl->u.disable_migrate.disable; + domain_unpause(d); + + rcu_unlock_domain(d); + ret =3D 0; + } + break; + case XEN_DOMCTL_suppress_spurious_page_faults: { struct domain *d; diff -r ea34183c5c11 xen/include/asm-x86/domain.h --- a/xen/include/asm-x86/domain.h=09Mon Oct 19 13:31:21 2009 +0100 +++ b/xen/include/asm-x86/domain.h=09Mon Oct 19 15:50:06 2009 -0600 @@ -304,6 +304,9 @@ struct arch_domain spinlock_t vtsc_lock; uint64_t vtsc_kerncount; /* for hvm, counts all vtsc */ uint64_t vtsc_usercount; /* not used for hvm */ + + /* mark domain as non-migratable and non-restoreable */ + bool_t disable_migrate; } __cacheline_aligned; =20 #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) diff -r ea34183c5c11 xen/include/public/domctl.h --- a/xen/include/public/domctl.h=09Mon Oct 19 13:31:21 2009 +0100 +++ b/xen/include/public/domctl.h=09Mon Oct 19 15:50:06 2009 -0600 @@ -653,6 +653,12 @@ typedef struct xen_domctl_hvmcontext_par } xen_domctl_hvmcontext_partial_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_partial_t); =20 +#define XEN_DOMCTL_disable_migrate 58 +typedef struct xen_domctl_disable_migrate { + uint32_t disable; /* IN: 1: disable migration and restore */ +} xen_domctl_disable_migrate_t; + + #define XEN_DOMCTL_gdbsx_guestmemio 1000 /* guest mem io */ struct xen_domctl_gdbsx_memio { uint64_aligned_t pgd3val;/* optional: init_mm.pgd[3] value */ @@ -703,6 +709,7 @@ struct xen_domctl { struct xen_domctl_arch_setup arch_setup; struct xen_domctl_settimeoffset settimeoffset; struct xen_domctl_set_tsc_native set_tsc_native; + struct xen_domctl_disable_migrate disable_migrate; struct xen_domctl_real_mode_area real_mode_area; struct xen_domctl_hvmcontext hvmcontext; struct xen_domctl_hvmcontext_partial hvmcontext_partial; --__12559902924723382abhmt020.oracle.com Content-Type: application/octet-stream; name="nomigrate.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="nomigrate.patch" ZGlmZiAtciBlYTM0MTgzYzVjMTEgdG9vbHMvbGlieGMveGNfZG9tYWluLmMKLS0tIGEvdG9vbHMv bGlieGMveGNfZG9tYWluLmMJTW9uIE9jdCAxOSAxMzozMToyMSAyMDA5ICswMTAwCisrKyBiL3Rv b2xzL2xpYnhjL3hjX2RvbWFpbi5jCU1vbiBPY3QgMTkgMTU6NTA6MDYgMjAwOSAtMDYwMApAQCAt NDcyLDYgKzQ3MiwxNSBAQCBpbnQgeGNfZG9tYWluX3NldF90c2NfbmF0aXZlKGludCB4Y19oYW5k CiAgICAgZG9tY3RsLmNtZCA9IFhFTl9ET01DVExfc2V0X3RzY19uYXRpdmU7CiAgICAgZG9tY3Rs LmRvbWFpbiA9IChkb21pZF90KWRvbWlkOwogICAgIGRvbWN0bC51LnNldF90c2NfbmF0aXZlLmlz X25hdGl2ZSA9IGlzX25hdGl2ZTsKKyAgICByZXR1cm4gZG9fZG9tY3RsKHhjX2hhbmRsZSwgJmRv bWN0bCk7Cit9CisKK2ludCB4Y19kb21haW5fZGlzYWJsZV9taWdyYXRlKGludCB4Y19oYW5kbGUs IHVpbnQzMl90IGRvbWlkKQoreworICAgIERFQ0xBUkVfRE9NQ1RMOworICAgIGRvbWN0bC5jbWQg PSBYRU5fRE9NQ1RMX2Rpc2FibGVfbWlncmF0ZTsKKyAgICBkb21jdGwuZG9tYWluID0gKGRvbWlk X3QpZG9taWQ7CisgICAgZG9tY3RsLnUuZGlzYWJsZV9taWdyYXRlLmRpc2FibGUgPSAxOwogICAg IHJldHVybiBkb19kb21jdGwoeGNfaGFuZGxlLCAmZG9tY3RsKTsKIH0KIApkaWZmIC1yIGVhMzQx ODNjNWMxMSB0b29scy9saWJ4Yy94ZW5jdHJsLmgKLS0tIGEvdG9vbHMvbGlieGMveGVuY3RybC5o CU1vbiBPY3QgMTkgMTM6MzE6MjEgMjAwOSArMDEwMAorKysgYi90b29scy9saWJ4Yy94ZW5jdHJs LmgJTW9uIE9jdCAxOSAxNTo1MDowNiAyMDA5IC0wNjAwCkBAIC02MjksNiArNjI5LDggQEAgaW50 IHhjX2RvbWFpbl9zZXRfdGltZV9vZmZzZXQoaW50IHhjX2hhbgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW50MzJfdCB0aW1lX29mZnNldF9zZWNvbmRzKTsKIAogaW50IHhjX2RvbWFp bl9zZXRfdHNjX25hdGl2ZShpbnQgeGNfaGFuZGxlLCB1aW50MzJfdCBkb21pZCwgaW50IGlzX25h dGl2ZSk7CisKK2ludCB4Y19kb21haW5fZGlzYWJsZV9taWdyYXRlKGludCB4Y19oYW5kbGUsIHVp bnQzMl90IGRvbWlkKTsKIAogaW50IHhjX2RvbWFpbl9tZW1vcnlfaW5jcmVhc2VfcmVzZXJ2YXRp b24oaW50IHhjX2hhbmRsZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHVpbnQzMl90IGRvbWlkLApkaWZmIC1yIGVhMzQxODNjNWMxMSB0b29scy9weXRob24veGVu L2xvd2xldmVsL3hjL3hjLmMKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94Yy94Yy5j CU1vbiBPY3QgMTkgMTM6MzE6MjEgMjAwOSArMDEwMAorKysgYi90b29scy9weXRob24veGVuL2xv d2xldmVsL3hjL3hjLmMJTW9uIE9jdCAxOSAxNTo1MDowNiAyMDA5IC0wNjAwCkBAIC0xNDc5LDYg KzE0NzksMjAgQEAgc3RhdGljIFB5T2JqZWN0ICpweXhjX2RvbWFpbl9zZXRfdHNjX25hdAogICAg ICAgICByZXR1cm4gTlVMTDsKIAogICAgIGlmICh4Y19kb21haW5fc2V0X3RzY19uYXRpdmUoc2Vs Zi0+eGNfaGFuZGxlLCBkb20sIGlzX25hdGl2ZSkgIT0gMCkKKyAgICAgICAgcmV0dXJuIHB5eGNf ZXJyb3JfdG9fZXhjZXB0aW9uKCk7CisKKyAgICBQeV9JTkNSRUYoemVybyk7CisgICAgcmV0dXJu IHplcm87Cit9CisKK3N0YXRpYyBQeU9iamVjdCAqcHl4Y19kb21haW5fZGlzYWJsZV9taWdyYXRl KFhjT2JqZWN0ICpzZWxmLCBQeU9iamVjdCAqYXJncykKK3sKKyAgICB1aW50MzJfdCBkb207CisK KyAgICBpZiAoIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgImkiLCAmZG9tKSkKKyAgICAgICAgcmV0 dXJuIE5VTEw7CisKKyAgICBpZiAoeGNfZG9tYWluX2Rpc2FibGVfbWlncmF0ZShzZWxmLT54Y19o YW5kbGUsIGRvbSkgIT0gMCkKICAgICAgICAgcmV0dXJuIHB5eGNfZXJyb3JfdG9fZXhjZXB0aW9u KCk7CiAKICAgICBQeV9JTkNSRUYoemVybyk7CkBAIC0yMDE1LDYgKzIwMjksMTMgQEAgc3RhdGlj IFB5TWV0aG9kRGVmIHB5eGNfbWV0aG9kc1tdID0gewogICAgICAgIiBpc19uYXRpdmUgIFtpbnRd OiAxPW5hdGl2ZSwgMD1lbXVsYXRlLlxuIgogICAgICAgIlJldHVybnM6IFtpbnRdIDAgb24gc3Vj Y2VzczsgLTEgb24gZXJyb3IuXG4iIH0sCiAKKyAgICB7ICJkb21haW5fZGlzYWJsZV9taWdyYXRl IiwKKyAgICAgIChQeUNGdW5jdGlvbilweXhjX2RvbWFpbl9kaXNhYmxlX21pZ3JhdGUsCisgICAg ICBNRVRIX1ZBUkFSR1MsICJcbiIKKyAgICAgICJNYXJrcyBkb21haW4gYXMgbm9uLW1pZ3JhdGFi bGUgQU5EIG5vbi1yZXN0b3JlYWJsZVxuIgorICAgICAgIiBkb20gICAgICAgIFtpbnRdOiBEb21h aW4gd2hvc2UgVFNDIG1vZGUgaXMgYmVpbmcgc2V0LlxuIgorICAgICAgIlJldHVybnM6IFtpbnRd IDAgb24gc3VjY2VzczsgLTEgb24gZXJyb3IuXG4iIH0sCisKICAgICB7ICJkb21haW5fc2VuZF90 cmlnZ2VyIiwKICAgICAgIChQeUNGdW5jdGlvbilweXhjX2RvbWFpbl9zZW5kX3RyaWdnZXIsCiAg ICAgICBNRVRIX1ZBUkFSR1MgfCBNRVRIX0tFWVdPUkRTLCAiXG4iCmRpZmYgLXIgZWEzNDE4M2M1 YzExIHRvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kQ2hlY2twb2ludC5weQotLS0gYS90b29scy9w eXRob24veGVuL3hlbmQvWGVuZENoZWNrcG9pbnQucHkJTW9uIE9jdCAxOSAxMzozMToyMSAyMDA5 ICswMTAwCisrKyBiL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kQ2hlY2twb2ludC5weQlNb24g T2N0IDE5IDE1OjUwOjA2IDIwMDkgLTA2MDAKQEAgLTIyNiw2ICsyMjYsMTkgQEAgZGVmIHJlc3Rv cmUoeGQsIGZkLCBkb21pbmZvID0gTm9uZSwgcGF1cwogICAgIGVsc2U6CiAgICAgICAgIGRvbWlu Zm8gPSB4ZC5yZXN0b3JlXyh2bWNvbmZpZykKIAorICAgIGltYWdlX2NmZyA9IGRvbWluZm8uaW5m by5nZXQoJ2ltYWdlJywge30pCisgICAgaXNfaHZtID0gZG9taW5mby5pbmZvLmlzX2h2bSgpCisK KyAgICBpZiBpc19odm06CisgICAgICAgIG5vbWlncmF0ZSA9IGRvbWluZm8uaW5mb1sncGxhdGZv cm0nXS5nZXQoJ25vbWlncmF0ZScsIDApCisgICAgZWxzZToKKyAgICAgICAgbm9taWdyYXRlID0g ZG9taW5mby5pbmZvWydwbGF0Zm9ybSddLmdldCgnbm9taWdyYXRlJykKKyAgICAgICAgaWYgbm9t aWdyYXRlIGlzIE5vbmU6CisgICAgICAgICAgICBub21pZ3JhdGUgPSAwCisgICAgaWYgaW50KG5v bWlncmF0ZSkgIT0gMDoKKyAgICAgICAgZG9taW5mby5kZXN0cm95KCkKKyAgICAgICAgcmFpc2Ug WGVuZEVycm9yKCJjYW5ub3QgcmVzdG9yZSBub24tbWlncmF0YWJsZSBkb21haW4iKQorCiAgICAg IyByZXBpbiBkb21haW4gdmNwdXMgaWYgYSB0YXJnZXQgbm9kZSBudW1iZXIgd2FzIHNwZWNpZmll ZCAKICAgICAjIHRoaXMgaXMgZG9uZSBwcmlvciB0byBtZW1vcnkgYWxsb2NhdGlvbiB0byBhaWRl IGluIG1lbW9yeQogICAgICMgZGlzdHJpYnV0aW9uIGZvciBOVU1BIHN5c3RlbXMuCkBAIC0yNDgs OCArMjYxLDYgQEAgZGVmIHJlc3RvcmUoeGQsIGZkLCBkb21pbmZvID0gTm9uZSwgcGF1cwogICAg IGFzc2VydCBjb25zb2xlX3BvcnQKIAogICAgICMgaWYgaHZtLCBwYXNzIG1lbSBzaXplIHRvIGNh bGN1bGF0ZSB0aGUgc3RvcmVfbWZuCi0gICAgaW1hZ2VfY2ZnID0gZG9taW5mby5pbmZvLmdldCgn aW1hZ2UnLCB7fSkKLSAgICBpc19odm0gPSBkb21pbmZvLmluZm8uaXNfaHZtKCkKICAgICBpZiBp c19odm06CiAgICAgICAgIGFwaWMgPSBpbnQoZG9taW5mby5pbmZvWydwbGF0Zm9ybSddLmdldCgn YXBpYycsIDApKQogICAgICAgICBwYWUgID0gaW50KGRvbWluZm8uaW5mb1sncGxhdGZvcm0nXS5n ZXQoJ3BhZScsICAwKSkKZGlmZiAtciBlYTM0MTgzYzVjMTEgdG9vbHMvcHl0aG9uL3hlbi94ZW5k L1hlbmRDb25maWcucHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmRDb25maWcucHkJ TW9uIE9jdCAxOSAxMzozMToyMSAyMDA5ICswMTAwCisrKyBiL3Rvb2xzL3B5dGhvbi94ZW4veGVu ZC9YZW5kQ29uZmlnLnB5CU1vbiBPY3QgMTkgMTU6NTA6MDYgMjAwOSAtMDYwMApAQCAtMTQ2LDYg KzE0Niw3IEBAIFhFTkFQSV9QTEFURk9STV9DRkdfVFlQRVMgPSB7CiAgICAgJ2xvY2FsdGltZSc6 IGludCwKICAgICAnbW9uaXRvcic6IGludCwKICAgICAnbm9ncmFwaGljJzogaW50LAorICAgICdu b21pZ3JhdGUnOiBpbnQsCiAgICAgJ3BhZScgOiBpbnQsCiAgICAgJ3J0Y190aW1lb2Zmc2V0Jzog aW50LAogICAgICdzZXJpYWwnOiBzdHIsCkBAIC00NzgsNiArNDc5LDkgQEAgY2xhc3MgWGVuZENv bmZpZyhkaWN0KToKIAogICAgICAgICBpZiAndHNjX25hdGl2ZScgbm90IGluIHNlbGZbJ3BsYXRm b3JtJ106CiAgICAgICAgICAgICBzZWxmWydwbGF0Zm9ybSddWyd0c2NfbmF0aXZlJ10gPSAwCisK KyAgICAgICAgaWYgJ25vbWlncmF0ZScgbm90IGluIHNlbGZbJ3BsYXRmb3JtJ106CisgICAgICAg ICAgICBzZWxmWydwbGF0Zm9ybSddWydub21pZ3JhdGUnXSA9IDAKIAogICAgICAgICBpZiBzZWxm LmlzX2h2bSgpOgogICAgICAgICAgICAgaWYgJ3RpbWVyX21vZGUnIG5vdCBpbiBzZWxmWydwbGF0 Zm9ybSddOgpkaWZmIC1yIGVhMzQxODNjNWMxMSB0b29scy9weXRob24veGVuL3hlbmQvWGVuZERv bWFpbkluZm8ucHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmREb21haW5JbmZvLnB5 CU1vbiBPY3QgMTkgMTM6MzE6MjEgMjAwOSArMDEwMAorKysgYi90b29scy9weXRob24veGVuL3hl bmQvWGVuZERvbWFpbkluZm8ucHkJTW9uIE9jdCAxOSAxNTo1MDowNiAyMDA5IC0wNjAwCkBAIC0y NDIxLDcgKzI0MjEsNyBAQCBjbGFzcyBYZW5kRG9tYWluSW5mbzoKICAgICAgICAgICAgIHMzX2lu dGVncml0eSA9IHNlbGYuaW5mb1snczNfaW50ZWdyaXR5J10KIAogICAgICAgICBvb3MgPSBzZWxm LmluZm9bJ3BsYXRmb3JtJ10uZ2V0KCdvb3MnLCAxKQotICAgICAgICBvb3Nfb2ZmID0gMSAtIG9v cworICAgICAgICBvb3Nfb2ZmID0gMSAtIGludChvb3MpCiAKICAgICAgICAgZmxhZ3MgPSAoaW50 KGh2bSkgPDwgMCkgfCAoaW50KGhhcCkgPDwgMSkgfCAoaW50KHMzX2ludGVncml0eSkgPDwgMikg fCAoaW50KG9vc19vZmYpIDw8IDMpCiAKQEAgLTI0NjMsNiArMjQ2MywxMSBAQCBjbGFzcyBYZW5k RG9tYWluSW5mbzoKICAgICAgICAgdmlyaWRpYW4gPSBzZWxmLmluZm9bInBsYXRmb3JtIl0uZ2V0 KCJ2aXJpZGlhbiIpCiAgICAgICAgIGlmIGFyY2gudHlwZSA9PSAieDg2IiBhbmQgaHZtIGFuZCB2 aXJpZGlhbiBpcyBub3QgTm9uZToKICAgICAgICAgICAgIHhjLmh2bV9zZXRfcGFyYW0oc2VsZi5k b21pZCwgSFZNX1BBUkFNX1ZJUklESUFOLCBsb25nKHZpcmlkaWFuKSkKKworICAgICAgICAjIElm IG5vbWlncmF0ZSBpcyBzZXQsIGRpc2FibGUgbWlncmF0aW9uCisgICAgICAgIG5vbWlncmF0ZSA9 IHNlbGYuaW5mb1sicGxhdGZvcm0iXS5nZXQoIm5vbWlncmF0ZSIpCisgICAgICAgIGlmIGFyY2gu dHlwZSA9PSAieDg2IiBhbmQgbm9taWdyYXRlIGlzIG5vdCBOb25lIGFuZCBsb25nKG5vbWlncmF0 ZSkgIT0gMDoKKyAgICAgICAgICAgIHhjLmRvbWFpbl9kaXNhYmxlX21pZ3JhdGUoc2VsZi5kb21p ZCkKIAogICAgICAgICAjIE9wdGlvbmFsbHkgZW5hYmxlIHZpcnR1YWwgSFBFVAogICAgICAgICBo cGV0ID0gc2VsZi5pbmZvWyJwbGF0Zm9ybSJdLmdldCgiaHBldCIpCmRpZmYgLXIgZWEzNDE4M2M1 YzExIHRvb2xzL3B5dGhvbi94ZW4veG0vY3JlYXRlLnB5Ci0tLSBhL3Rvb2xzL3B5dGhvbi94ZW4v eG0vY3JlYXRlLnB5CU1vbiBPY3QgMTkgMTM6MzE6MjEgMjAwOSArMDEwMAorKysgYi90b29scy9w eXRob24veGVuL3htL2NyZWF0ZS5weQlNb24gT2N0IDE5IDE1OjUwOjA2IDIwMDkgLTA2MDAKQEAg LTIyNCw2ICsyMjQsMTAgQEAgZ29wdHMudmFyKCd0c2NfbmF0aXZlJywgdmFsPSdUU0NfTkFUSVZF JwogZ29wdHMudmFyKCd0c2NfbmF0aXZlJywgdmFsPSdUU0NfTkFUSVZFJywKICAgICAgICAgICBm bj1zZXRfaW50LCBkZWZhdWx0PTAsCiAgICAgICAgICAgdXNlPSIiIlRTQyBtb2RlICgwPWVtdWxh dGUgVFNDLCAxPW5hdGl2ZSBUU0MpLiIiIikKKworZ29wdHMudmFyKCdub21pZ3JhdGUnLCB2YWw9 J05PTUlHUkFURScsCisgICAgICAgICAgZm49c2V0X2ludCwgZGVmYXVsdD0wLAorICAgICAgICAg IHVzZT0iIiJtaWdyYXRhYmlsaXR5ICgwPW1pZ3JhdGlvbiBlbmFibGVkLCAxPW1pZ3JhdGlvbiBk aXNhYmxlZCkuIiIiKQogCiBnb3B0cy52YXIoJ3ZwdF9hbGlnbicsIHZhbD0nVlBUX0FMSUdOJywK ICAgICAgICAgICBmbj1zZXRfaW50LCBkZWZhdWx0PTEsCkBAIC03MzcsNiArNzQxLDkgQEAgZGVm IGNvbmZpZ3VyZV9pbWFnZSh2YWxzKToKICAgICBpZiB2YWxzLnRzY19uYXRpdmUgaXMgbm90IE5v bmU6CiAgICAgICAgIGNvbmZpZ19pbWFnZS5hcHBlbmQoWyd0c2NfbmF0aXZlJywgdmFscy50c2Nf bmF0aXZlXSkKIAorICAgIGlmIHZhbHMubm9taWdyYXRlIGlzIG5vdCBOb25lOgorICAgICAgICBj b25maWdfaW1hZ2UuYXBwZW5kKFsnbm9taWdyYXRlJywgdmFscy5ub21pZ3JhdGVdKQorCiAgICAg cmV0dXJuIGNvbmZpZ19pbWFnZQogICAgIAogZGVmIGNvbmZpZ3VyZV9kaXNrcyhjb25maWdfZGV2 cywgdmFscyk6CkBAIC0xMDIwLDcgKzEwMjcsNyBAQCBkZWYgbWFrZV9jb25maWcodmFscyk6CiAg ICAgICAgICAgICAgICAgY29uZmlnLmFwcGVuZChbbiwgdl0pCiAKICAgICBtYXAoYWRkX2NvbmYs IFsnbmFtZScsICdtZW1vcnknLCAnbWF4bWVtJywgJ3NoYWRvd19tZW1vcnknLAotICAgICAgICAg ICAgICAgICAgICdyZXN0YXJ0JywgJ29uX3Bvd2Vyb2ZmJywgJ3RzY19uYXRpdmUnLAorICAgICAg ICAgICAgICAgICAgICdyZXN0YXJ0JywgJ29uX3Bvd2Vyb2ZmJywgJ3RzY19uYXRpdmUnLCAnbm9t aWdyYXRlJywKICAgICAgICAgICAgICAgICAgICAnb25fcmVib290JywgJ29uX2NyYXNoJywgJ3Zj cHVzJywgJ3ZjcHVfYXZhaWwnLCAnZmVhdHVyZXMnLAogICAgICAgICAgICAgICAgICAgICdvbl94 ZW5kX3N0YXJ0JywgJ29uX3hlbmRfc3RvcCcsICd0YXJnZXQnLCAnY3B1aWQnLAogICAgICAgICAg ICAgICAgICAgICdjcHVpZF9jaGVjaycsICdtYWNoaW5lX2FkZHJlc3Nfc2l6ZScsICdzdXBwcmVz c19zcHVyaW91c19wYWdlX2ZhdWx0cyddKQpkaWZmIC1yIGVhMzQxODNjNWMxMSB0b29scy9weXRo b24veGVuL3htL3hlbmFwaV9jcmVhdGUucHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi94bS94ZW5h cGlfY3JlYXRlLnB5CU1vbiBPY3QgMTkgMTM6MzE6MjEgMjAwOSArMDEwMAorKysgYi90b29scy9w eXRob24veGVuL3htL3hlbmFwaV9jcmVhdGUucHkJTW9uIE9jdCAxOSAxNTo1MDowNiAyMDA5IC0w NjAwCkBAIC0xMDc5LDYgKzEwNzksNyBAQCBjbGFzcyBzeHAyeG1sOgogICAgICAgICAgICAgJ3hl bl9wbGF0Zm9ybV9wY2knLAogICAgICAgICAgICAgJ3RzY19uYXRpdmUnCiAgICAgICAgICAgICAn ZGVzY3JpcHRpb24nLAorICAgICAgICAgICAgJ25vbWlncmF0ZScKICAgICAgICAgXQogCiAgICAg ICAgIHBsYXRmb3JtX2NvbmZpZ3MgPSBbXQpkaWZmIC1yIGVhMzQxODNjNWMxMSB4ZW4vYXJjaC94 ODYvZG9tYWluLmMKLS0tIGEveGVuL2FyY2gveDg2L2RvbWFpbi5jCU1vbiBPY3QgMTkgMTM6MzE6 MjEgMjAwOSArMDEwMAorKysgYi94ZW4vYXJjaC94ODYvZG9tYWluLmMJTW9uIE9jdCAxOSAxNTo1 MDowNiAyMDA5IC0wNjAwCkBAIC01MjEsNiArNTIxLDkgQEAgaW50IGFyY2hfZG9tYWluX2NyZWF0 ZShzdHJ1Y3QgZG9tYWluICpkLAogICAgIH0KIAogICAgIHNwaW5fbG9ja19pbml0KCZkLT5hcmNo LnZ0c2NfbG9jayk7CisKKyAgICBpZiAoIGQtPmRvbWFpbl9pZCA9PSAwICkKKyAgICAgICAgZC0+ ZGlzYWJsZV9taWdyYXRlID0gMTsKIAogICAgIHJldHVybiAwOwogCmRpZmYgLXIgZWEzNDE4M2M1 YzExIHhlbi9hcmNoL3g4Ni9kb21jdGwuYwotLS0gYS94ZW4vYXJjaC94ODYvZG9tY3RsLmMJTW9u IE9jdCAxOSAxMzozMToyMSAyMDA5ICswMTAwCisrKyBiL3hlbi9hcmNoL3g4Ni9kb21jdGwuYwlN b24gT2N0IDE5IDE1OjUwOjA2IDIwMDkgLTA2MDAKQEAgLTExMDAsNiArMTEwMCwyNCBAQCBsb25n IGFyY2hfZG9fZG9tY3RsKAogICAgIH0KICAgICBicmVhazsKIAorICAgIGNhc2UgWEVOX0RPTUNU TF9kaXNhYmxlX21pZ3JhdGU6CisgICAgeworICAgICAgICBzdHJ1Y3QgZG9tYWluICpkOworCisg ICAgICAgIHJldCA9IC1FU1JDSDsKKyAgICAgICAgZCA9IHJjdV9sb2NrX2RvbWFpbl9ieV9pZChk b21jdGwtPmRvbWFpbik7CisgICAgICAgIGlmICggZCA9PSBOVUxMICkKKyAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgIGRvbWFpbl9wYXVzZShkKTsKKyAgICAgICAgZC0+YXJjaC5kaXNhYmxl X21pZ3JhdGUgPSBkb21jdGwtPnUuZGlzYWJsZV9taWdyYXRlLmRpc2FibGU7CisgICAgICAgIGRv bWFpbl91bnBhdXNlKGQpOworCisgICAgICAgIHJjdV91bmxvY2tfZG9tYWluKGQpOworICAgICAg ICByZXQgPSAwOworICAgIH0KKyAgICBicmVhazsKKwogICAgIGNhc2UgWEVOX0RPTUNUTF9zdXBw cmVzc19zcHVyaW91c19wYWdlX2ZhdWx0czoKICAgICB7CiAgICAgICAgIHN0cnVjdCBkb21haW4g KmQ7CmRpZmYgLXIgZWEzNDE4M2M1YzExIHhlbi9pbmNsdWRlL2FzbS14ODYvZG9tYWluLmgKLS0t IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9kb21haW4uaAlNb24gT2N0IDE5IDEzOjMxOjIxIDIwMDkg KzAxMDAKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9kb21haW4uaAlNb24gT2N0IDE5IDE1OjUw OjA2IDIwMDkgLTA2MDAKQEAgLTMwNCw2ICszMDQsOSBAQCBzdHJ1Y3QgYXJjaF9kb21haW4KICAg ICBzcGlubG9ja190IHZ0c2NfbG9jazsKICAgICB1aW50NjRfdCB2dHNjX2tlcm5jb3VudDsgLyog Zm9yIGh2bSwgY291bnRzIGFsbCB2dHNjICovCiAgICAgdWludDY0X3QgdnRzY191c2VyY291bnQ7 IC8qIG5vdCB1c2VkIGZvciBodm0gKi8KKworICAgIC8qIG1hcmsgZG9tYWluIGFzIG5vbi1taWdy YXRhYmxlIGFuZCBub24tcmVzdG9yZWFibGUgKi8KKyAgICBib29sX3QgZGlzYWJsZV9taWdyYXRl OwogfSBfX2NhY2hlbGluZV9hbGlnbmVkOwogCiAjZGVmaW5lIGhhc19hcmNoX3BkZXZzKGQpICAg ICghbGlzdF9lbXB0eSgmKGQpLT5hcmNoLnBkZXZfbGlzdCkpCmRpZmYgLXIgZWEzNDE4M2M1YzEx IHhlbi9pbmNsdWRlL3B1YmxpYy9kb21jdGwuaAotLS0gYS94ZW4vaW5jbHVkZS9wdWJsaWMvZG9t Y3RsLmgJTW9uIE9jdCAxOSAxMzozMToyMSAyMDA5ICswMTAwCisrKyBiL3hlbi9pbmNsdWRlL3B1 YmxpYy9kb21jdGwuaAlNb24gT2N0IDE5IDE1OjUwOjA2IDIwMDkgLTA2MDAKQEAgLTY1Myw2ICs2 NTMsMTIgQEAgdHlwZWRlZiBzdHJ1Y3QgeGVuX2RvbWN0bF9odm1jb250ZXh0X3BhcgogfSB4ZW5f ZG9tY3RsX2h2bWNvbnRleHRfcGFydGlhbF90OwogREVGSU5FX1hFTl9HVUVTVF9IQU5ETEUoeGVu X2RvbWN0bF9odm1jb250ZXh0X3BhcnRpYWxfdCk7CiAKKyNkZWZpbmUgWEVOX0RPTUNUTF9kaXNh YmxlX21pZ3JhdGUgICAgNTgKK3R5cGVkZWYgc3RydWN0IHhlbl9kb21jdGxfZGlzYWJsZV9taWdy YXRlIHsKKyAgICB1aW50MzJfdCBkaXNhYmxlOyAvKiBJTjogMTogZGlzYWJsZSBtaWdyYXRpb24g YW5kIHJlc3RvcmUgKi8KK30geGVuX2RvbWN0bF9kaXNhYmxlX21pZ3JhdGVfdDsKKworCiAjZGVm aW5lIFhFTl9ET01DVExfZ2Ric3hfZ3Vlc3RtZW1pbyAgICAgMTAwMCAvKiBndWVzdCBtZW0gaW8g Ki8KIHN0cnVjdCB4ZW5fZG9tY3RsX2dkYnN4X21lbWlvIHsKICAgICB1aW50NjRfYWxpZ25lZF90 IHBnZDN2YWw7Lyogb3B0aW9uYWw6IGluaXRfbW0ucGdkWzNdIHZhbHVlICovCkBAIC03MDMsNiAr NzA5LDcgQEAgc3RydWN0IHhlbl9kb21jdGwgewogICAgICAgICBzdHJ1Y3QgeGVuX2RvbWN0bF9h cmNoX3NldHVwICAgICAgICBhcmNoX3NldHVwOwogICAgICAgICBzdHJ1Y3QgeGVuX2RvbWN0bF9z ZXR0aW1lb2Zmc2V0ICAgICBzZXR0aW1lb2Zmc2V0OwogICAgICAgICBzdHJ1Y3QgeGVuX2RvbWN0 bF9zZXRfdHNjX25hdGl2ZSAgICBzZXRfdHNjX25hdGl2ZTsKKyAgICAgICAgc3RydWN0IHhlbl9k b21jdGxfZGlzYWJsZV9taWdyYXRlICAgZGlzYWJsZV9taWdyYXRlOwogICAgICAgICBzdHJ1Y3Qg eGVuX2RvbWN0bF9yZWFsX21vZGVfYXJlYSAgICByZWFsX21vZGVfYXJlYTsKICAgICAgICAgc3Ry dWN0IHhlbl9kb21jdGxfaHZtY29udGV4dCAgICAgICAgaHZtY29udGV4dDsKICAgICAgICAgc3Ry dWN0IHhlbl9kb21jdGxfaHZtY29udGV4dF9wYXJ0aWFsIGh2bWNvbnRleHRfcGFydGlhbDsK --__12559902924723382abhmt020.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --__12559902924723382abhmt020.oracle.com--