From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruce Edge Subject: Re: [patch] Xen build - Debian vs Redhat layout patch options Date: Mon, 13 Sep 2010 16:53:39 -0700 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016e6480d3235a8c504902cce65 Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --0016e6480d3235a8c504902cce65 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Wed, Jul 7, 2010 at 4:19 AM, Stefano Stabellini wrote: > On Wed, 7 Jul 2010, Bruce Edge wrote: >> What's the right way to address these sort RedHat vs. Debian things in t= he Xen build? >> >> - rm -f =A0$(D)$(CONFIG_DIR)/sysconfig/xendomains >> + rm -f =A0$(D)$(CONFIG_DIR)/default/xendomains >> >> - mkdir -p /var/lock/subsys >> - touch /var/lock/subsys/xend >> + mkdir -p /var/lock >> + touch /var/lock/xend >> >> Can I submit a patch that uses a config var to switch on which path use = ? >> >> Or, where should such a build time switch go? Env, or? >> ...assuming that it's even an option. >> >> There's a couple of different downstream patches that others are maintai= ning to handle this kind of stuff, but that lag >> behind the xen-unstable tree and it seems like an upstream patch to hand= le this distro variation in the Xen build itself >> would be a better long term solution. >> > > A way to switch between the two would be nice, I would accept a patch > that accomplish that using a config var (something in Config.mk ?. > The default value of this config variable might be detected looking at > the existence of /etc/sysconfig or /etc/default. > > Keep in mind that besides sysconfig vs. default there are other subtle > differences, like the chkconfig line in the init scripts > (tools/hotplug/Linux/init.d/xencommons for example). > Here's my attempt at the above. It defaults to the current behavior with the debian option being an env setting. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D cut =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D There are 2 locations that are not optimal for Debian based distributions. These are /etc/sysconfig, and /var/subsys. Debian uses /etc/default and /var for these respectively. This patch provides a new make config variable, XEN_CONFIG_ARCH, which changes the location of these 2 elements if set. If unset it defaults to the current behavior, but if set to the string "default", it uses the Debian locations. For the runtime scripts it checks whether the Red Hat sysconfig files exist first, then looks in the Debian location. This lets the config files reside in the desired location and does not require any additional runtime config file to point to their location. This patch also adds a sysconfig.txt file describing the build time usage. Author: Bruce Edge Signed-off-by: Bruce Edge Index: xen-unstable.hg/Config.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/Config.mk 2010-09-13 10:44:48.000000000 -0700 +++ xen-unstable.hg/Config.mk 2010-09-13 10:45:11.000000000 -0700 @@ -8,6 +8,9 @@ XEN_TARGET_ARCH ?=3D $(XEN_COMPILE_ARCH) XEN_OS ?=3D $(shell uname -s) +# Override for debian based systems that use /etc instead of /etc/sysconfi= g +XEN_CONFIG_ARCH ?=3D /sysconfig + CONFIG_$(XEN_OS) :=3D y SHELL ?=3D /bin/sh Index: xen-unstable.hg/config/StdGNU.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/config/StdGNU.mk 2010-09-13 10:44:48.000000000 -0700 +++ xen-unstable.hg/config/StdGNU.mk 2010-09-13 10:45:11.000000000 -0700 @@ -49,7 +49,7 @@ CONFIG_DIR =3D $(PREFIX)/etc endif -SYSCONFIG_DIR =3D $(CONFIG_DIR)/sysconfig +SYSCONFIG_DIR =3D $(CONFIG_DIR)/$(XEN_CONFIG_ARCH) XEN_CONFIG_DIR =3D $(CONFIG_DIR)/xen XEN_SCRIPT_DIR =3D $(XEN_CONFIG_DIR)/scripts Index: xen-unstable.hg/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/Makefile 2010-09-13 10:44:48.000000000 -0700 +++ xen-unstable.hg/Makefile 2010-09-13 10:45:11.000000000 -0700 @@ -203,7 +203,7 @@ rm -f $(D)$(CONFIG_DIR)/udev/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(CONFIG_DIR)/udev/xend.rules - rm -f $(D)$(CONFIG_DIR)/sysconfig/xendomains + rm -f $(D)$(SYSCONFIG_DIR)/xendomains rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* rm -rf $(D)/boot/*xen* rm -rf $(D)/lib/modules/*xen* Index: xen-unstable.hg/docs/misc/network_setup.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/docs/misc/network_setup.txt 2010-09-13 10:44:48.000000000 -0700 +++ xen-unstable.hg/docs/misc/network_setup.txt 2010-09-13 10:45:11.000000000 -0700 @@ -44,7 +44,7 @@ Creating network initscripts ---------------------------- -In the /etc/sysconfig/network-scripts directory it is necccessary to creat= e +In the /network-scripts directory it is necccessary to create 2 config files. The first (ifcfg-eth0) defines your physical network inter= face, and says that it will be part of a bridge: @@ -79,8 +79,8 @@ The final step is to configure iptables to allow all traffic to be forwarded across the bridge -# echo "-I FORWARD -m physdev --physdev-is-bridged -j ACCEPT" > /etc/sysconfig/iptables-forward-bridged -# lokkit --custom-rules=3Dipv4:filter:/etc/sysconfig/iptables-forward-brid= ged +# echo "-I FORWARD -m physdev --physdev-is-bridged -j ACCEPT" > /iptables-forward-bridged +# lokkit --custom-rules=3Dipv4:filter:/iptables-forward-bridged # service libvirtd reload Alternatively, you can prevent bridged traffic getting pushed through Index: xen-unstable.hg/docs/misc/sysconfig.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ xen-unstable.hg/docs/misc/sysconfig.txt 2010-09-13 10:45:11.000000000 -0700 @@ -0,0 +1,14 @@ +This describes the use of the and variables. + +Red hat and most other RPM based distros use /etc/sysconfig for configuration data. + +Debian and other derivative distros use /etc/default for this same data. + +The same applies to /var/subsys and /var. Red Hat uses the former and Debian the latter. + +These differences are handled by the XEN_CONFIG_ARCH build time variable. The default is for the Red Hat configuration. Debian and other derivatives need to set this variable to "default" in the build shell's environment. + +eg: + +XEN_CONFIG_ARCH=3D"" make dist + Index: xen-unstable.hg/tools/vnet/doc/vnet-xend.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/vnet/doc/vnet-xend.txt 2010-09-13 10:44:49.000000000 -0700 +++ xen-unstable.hg/tools/vnet/doc/vnet-xend.txt 2010-09-13 10:45:11.000000000 -0700 @@ -79,8 +79,8 @@ MTU=3D1400 -in /etc/sysconfig/network-scripts/ifcfg-eth0. You may also have to change or remove -cached config files for eth0 under /etc/sysconfig/networking. +in /network-scripts/ifcfg-eth0. You may also have to change or remove +cached config files for eth0 under /networking. Once configured, vnets are persistent in the xend database. To remove a vnet use Index: xen-unstable.hg/tools/xenballoon/xenballoond.init =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/xenballoon/xenballoond.init 2010-09-13 10:44:49.000000000 -0700 +++ xen-unstable.hg/tools/xenballoon/xenballoond.init 2010-09-13 10:45:11.000000000 -0700 @@ -29,6 +29,10 @@ if [ -f /etc/sysconfig/xenballoon.conf ]; then . /etc/sysconfig/xenballoon.conf +else + if [ -f /etc/default/xenballoon.conf ]; then + . /etc/default/xenballoon.conf + fi fi # Check that balloon driver is present Index: xen-unstable.hg/tools/xenballoon/xenballoond =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/xenballoon/xenballoond 2010-09-13 10:44:49.000000000 -0700 +++ xen-unstable.hg/tools/xenballoon/xenballoond 2010-09-13 10:45:11.000000000 -0700 @@ -21,7 +21,7 @@ # If xenbus is running and the /usr/bin/xenstore-* tools are installed, # "xenbus is enabled". # -# Parameters are documented in /etc/sysconfig/xenballoon.conf. Although +# Parameters are documented in /xenballoon.conf. Although # some are not used with directed ballooning, all must be set properly. # If xenbus is enabled, some of these parameters may be overridden by valu= es # set by domain0 via xenbus. @@ -237,7 +237,13 @@ fi preswapnow=3D0 -. /etc/sysconfig/xenballoon.conf +if [ -f /etc/sysconfig/xenballoon.conf ]; then + . /etc/sysconfigxenballoon.conf +else + if [ -f /etc/default/xenballoon.conf ]; then + . /etc/default/xenballoon.conf + fi +fi while true; do Index: xen-unstable.hg/tools/xenballoon/xenballoond.README =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/xenballoon/xenballoond.README 2010-09-13 10:44:49.000000000 -0700 +++ xen-unstable.hg/tools/xenballoon/xenballoond.README 2010-09-13 10:45:11.000000000 -0700 @@ -59,10 +59,10 @@ Instructions to install/deploy xenballoond (in Redhat-based system): - in each guest: - ensure pre-requisites are met (see above) - - place xenballoon.conf in /etc/sysconfig + - place xenballoon.conf in - place xenballoond in /usr/sbin - copy xenballoond.init to /etc/rc.d/init.d/xenballoond (note file renam= e) - - edit /etc/sysconfig/xenballoond.conf as desired (especially note that + - edit /xenballoond.conf as desired (especially note that selfballooning defaults as off) - start xenballoond with "service xenballoond start", and/or configure xenballoond to start at init (e.g. "chkconfig xenballoond on") Index: xen-unstable.hg/tools/hotplug/Linux/init.d/xendomains =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/hotplug/Linux/init.d/xendomains 2010-09-13 10:44:48.000000000 -0700 +++ xen-unstable.hg/tools/hotplug/Linux/init.d/xendomains 2010-09-13 10:45:11.000000000 -0700 @@ -46,9 +46,13 @@ exit 0 fi -LOCKFILE=3D/var/lock/subsys/xendomains -XENDOM_CONFIG=3D/etc/sysconfig/xendomains - +if [ -d /etc/sysconfig ]; then + LOCKFILE=3D/var/lock/subsys/xendomains + XENDOM_CONFIG=3D/etc/sysconfig/xendomains +else + LOCKFILE=3D/var/lock/xendomains + XENDOM_CONFIG=3D/etc/default/xendomains +fi test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if [ "$1" =3D "stop" ]; then exit 0; else exit 6; fi; } Index: xen-unstable.hg/tools/hotplug/Linux/init.d/xend =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xen-unstable.hg.orig/tools/hotplug/Linux/init.d/xend 2010-09-13 13:53:19.000000000 -0700 +++ xen-unstable.hg/tools/hotplug/Linux/init.d/xend 2010-09-13 13:56:52.000000000 -0700 @@ -40,14 +40,20 @@ echo "xencommons should be started first." exit 1 fi - mkdir -p /var/lock/subsys - touch /var/lock/subsys/xend + # mkdir shouldn't be needed as most distros have this already created. Default to using subsys. + # This makes it Red Had/Debian agnostic + mkdir -p /var/lock + if [ -d /var/lock/subsys ] ; then + touch /var/lock/subsys/xend + else + touch /var/lock/xend + fi xend start await_daemons_up ;; stop) xend stop - rm -f /var/lock/subsys/xend + rm -f /var/lock/subsys/xend /var/lock/xend ;; status) xend status --0016e6480d3235a8c504902cce65 Content-Type: text/x-patch; charset=US-ASCII; name="sysconfig-alias.patch" Content-Disposition: attachment; filename="sysconfig-alias.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ge1zkhps0 VGhlcmUgYXJlIDIgbG9jYXRpb25zIHRoYXQgYXJlIG5vdCBvcHRpbWFsIGZvciBEZWJpYW4gYmFz ZWQgZGlzdHJpYnV0aW9ucy4KVGhlc2UgYXJlIC9ldGMvc3lzY29uZmlnLCBhbmQgL3Zhci9zdWJz eXMuCkRlYmlhbiB1c2VzIC9ldGMvZGVmYXVsdCBhbmQgL3ZhciBmb3IgdGhlc2UgcmVzcGVjdGl2 ZWx5LgpUaGlzIHBhdGNoIHByb3ZpZGVzIGEgbmV3IG1ha2UgY29uZmlnIHZhcmlhYmxlLCBYRU5f Q09ORklHX0FSQ0gsIHdoaWNoIGNoYW5nZXMgdGhlIGxvY2F0aW9uIG9mIHRoZXNlIDIgZWxlbWVu dHMgaWYgc2V0LgpJZiB1bnNldCBpdCBkZWZhdWx0cyB0byB0aGUgY3VycmVudCBiZWhhdmlvciwg YnV0IGlmIHNldCB0byB0aGUgc3RyaW5nICJkZWZhdWx0IiwgaXQgdXNlcyB0aGUgRGViaWFuIGxv Y2F0aW9ucy4KRm9yIHRoZSBydW50aW1lIHNjcmlwdHMgaXQgY2hlY2tzIHdoZXRoZXIgdGhlIFJl ZCBIYXQgc3lzY29uZmlnIGZpbGVzIGV4aXN0IGZpcnN0LCB0aGVuIGxvb2tzIGluIHRoZSBEZWJp YW4gbG9jYXRpb24uClRoaXMgbGV0cyB0aGUgY29uZmlnIGZpbGVzIHJlc2lkZSBpbiB0aGUgZGVz aXJlZCBsb2NhdGlvbiBhbmQgZG9lcyBub3QgcmVxdWlyZSBhbnkgYWRkaXRpb25hbCBydW50aW1l IGNvbmZpZyBmaWxlCnRvIHBvaW50IHRvIHRoZWlyIGxvY2F0aW9uLgpUaGlzIHBhdGNoIGFsc28g YWRkcyBhIHN5c2NvbmZpZy50eHQgZmlsZSBkZXNjcmliaW5nIHRoZSBidWlsZCB0aW1lIHVzYWdl LgpBdXRob3I6IEJydWNlIEVkZ2UgPGJydWNlLmVkZ2VAZ21haWwuY29tPgoKU2lnbmVkLW9mZi1i eTogQnJ1Y2UgRWRnZSA8YnJ1Y2UuZWRnZUBnbWFpbC5jb20+CgpJbmRleDogeGVuLXVuc3RhYmxl LmhnL0NvbmZpZy5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB4ZW4tdW5zdGFibGUuaGcub3JpZy9Db25maWcu bWsJMjAxMC0wOS0xMyAxMDo0NDo0OC4wMDAwMDAwMDAgLTA3MDAKKysrIHhlbi11bnN0YWJsZS5o Zy9Db25maWcubWsJMjAxMC0wOS0xMyAxMDo0NToxMS4wMDAwMDAwMDAgLTA3MDAKQEAgLTgsNiAr OCw5IEBACiBYRU5fVEFSR0VUX0FSQ0ggICAgID89ICQoWEVOX0NPTVBJTEVfQVJDSCkKIFhFTl9P UyAgICAgICAgICAgICAgPz0gJChzaGVsbCB1bmFtZSAtcykKIAorIyBPdmVycmlkZSBmb3IgZGVi aWFuIGJhc2VkIHN5c3RlbXMgdGhhdCB1c2UgL2V0YyBpbnN0ZWFkIG9mIC9ldGMvc3lzY29uZmln CitYRU5fQ09ORklHX0FSQ0ggICAgID89IC9zeXNjb25maWcKKwogQ09ORklHXyQoWEVOX09TKSA6 PSB5CiAKIFNIRUxMICAgICA/PSAvYmluL3NoCkluZGV4OiB4ZW4tdW5zdGFibGUuaGcvY29uZmln L1N0ZEdOVS5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSB4ZW4tdW5zdGFibGUuaGcub3JpZy9jb25maWcvU3Rk R05VLm1rCTIwMTAtMDktMTMgMTA6NDQ6NDguMDAwMDAwMDAwIC0wNzAwCisrKyB4ZW4tdW5zdGFi bGUuaGcvY29uZmlnL1N0ZEdOVS5tawkyMDEwLTA5LTEzIDEwOjQ1OjExLjAwMDAwMDAwMCAtMDcw MApAQCAtNDksNyArNDksNyBAQAogQ09ORklHX0RJUiA9ICQoUFJFRklYKS9ldGMKIGVuZGlmCiAK LVNZU0NPTkZJR19ESVIgPSAkKENPTkZJR19ESVIpL3N5c2NvbmZpZworU1lTQ09ORklHX0RJUiA9 ICQoQ09ORklHX0RJUikvJChYRU5fQ09ORklHX0FSQ0gpCiAKIFhFTl9DT05GSUdfRElSID0gJChD T05GSUdfRElSKS94ZW4KIFhFTl9TQ1JJUFRfRElSID0gJChYRU5fQ09ORklHX0RJUikvc2NyaXB0 cwpJbmRleDogeGVuLXVuc3RhYmxlLmhnL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhlbi11bnN0 YWJsZS5oZy5vcmlnL01ha2VmaWxlCTIwMTAtMDktMTMgMTA6NDQ6NDguMDAwMDAwMDAwIC0wNzAw CisrKyB4ZW4tdW5zdGFibGUuaGcvTWFrZWZpbGUJMjAxMC0wOS0xMyAxMDo0NToxMS4wMDAwMDAw MDAgLTA3MDAKQEAgLTIwMyw3ICsyMDMsNyBAQAogCXJtIC1mICAkKEQpJChDT05GSUdfRElSKS91 ZGV2L3hlbi1iYWNrZW5kLnJ1bGVzCiAJcm0gLWYgICQoRCkkKENPTkZJR19ESVIpL3VkZXYvcnVs ZXMuZC94ZW5kLnJ1bGVzCiAJcm0gLWYgICQoRCkkKENPTkZJR19ESVIpL3VkZXYveGVuZC5ydWxl cwotCXJtIC1mICAkKEQpJChDT05GSUdfRElSKS9zeXNjb25maWcveGVuZG9tYWlucworCXJtIC1m ICAkKEQpJChTWVNDT05GSUdfRElSKS94ZW5kb21haW5zCiAJcm0gLXJmICQoRCkvdmFyL3J1bi94 ZW4qICQoRCkvdmFyL2xpYi94ZW4qCiAJcm0gLXJmICQoRCkvYm9vdC8qeGVuKgogCXJtIC1yZiAk KEQpL2xpYi9tb2R1bGVzLyp4ZW4qCkluZGV4OiB4ZW4tdW5zdGFibGUuaGcvZG9jcy9taXNjL25l dHdvcmtfc2V0dXAudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhlbi11bnN0YWJsZS5oZy5vcmlnL2RvY3Mv bWlzYy9uZXR3b3JrX3NldHVwLnR4dAkyMDEwLTA5LTEzIDEwOjQ0OjQ4LjAwMDAwMDAwMCAtMDcw MAorKysgeGVuLXVuc3RhYmxlLmhnL2RvY3MvbWlzYy9uZXR3b3JrX3NldHVwLnR4dAkyMDEwLTA5 LTEzIDEwOjQ1OjExLjAwMDAwMDAwMCAtMDcwMApAQCAtNDQsNyArNDQsNyBAQAogQ3JlYXRpbmcg bmV0d29yayBpbml0c2NyaXB0cwogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1JbiB0 aGUgL2V0Yy9zeXNjb25maWcvbmV0d29yay1zY3JpcHRzIGRpcmVjdG9yeSBpdCBpcyBuZWNjY2Vz c2FyeSB0byBjcmVhdGUKK0luIHRoZSA8U1lTQ09ORklHPi9uZXR3b3JrLXNjcmlwdHMgZGlyZWN0 b3J5IGl0IGlzIG5lY2NjZXNzYXJ5IHRvIGNyZWF0ZQogMiBjb25maWcgZmlsZXMuIFRoZSBmaXJz dCAoaWZjZmctZXRoMCkgZGVmaW5lcyB5b3VyIHBoeXNpY2FsIG5ldHdvcmsgaW50ZXJmYWNlLAog YW5kIHNheXMgdGhhdCBpdCB3aWxsIGJlIHBhcnQgb2YgYSBicmlkZ2U6CiAKQEAgLTc5LDggKzc5 LDggQEAKIFRoZSBmaW5hbCBzdGVwIGlzIHRvIGNvbmZpZ3VyZSBpcHRhYmxlcyB0byBhbGxvdyBh bGwgdHJhZmZpYyB0byBiZQogZm9yd2FyZGVkIGFjcm9zcyB0aGUgYnJpZGdlCiAKLSMgZWNobyAi LUkgRk9SV0FSRCAtbSBwaHlzZGV2IC0tcGh5c2Rldi1pcy1icmlkZ2VkIC1qIEFDQ0VQVCIgPiAv ZXRjL3N5c2NvbmZpZy9pcHRhYmxlcy1mb3J3YXJkLWJyaWRnZWQKLSMgbG9ra2l0IC0tY3VzdG9t LXJ1bGVzPWlwdjQ6ZmlsdGVyOi9ldGMvc3lzY29uZmlnL2lwdGFibGVzLWZvcndhcmQtYnJpZGdl ZAorIyBlY2hvICItSSBGT1JXQVJEIC1tIHBoeXNkZXYgLS1waHlzZGV2LWlzLWJyaWRnZWQgLWog QUNDRVBUIiA+IDxTWVNDT05GSUc+L2lwdGFibGVzLWZvcndhcmQtYnJpZGdlZAorIyBsb2traXQg LS1jdXN0b20tcnVsZXM9aXB2NDpmaWx0ZXI6PFNZU0NPTkZJRz4vaXB0YWJsZXMtZm9yd2FyZC1i cmlkZ2VkCiAjIHNlcnZpY2UgbGlidmlydGQgcmVsb2FkCiAKIEFsdGVybmF0aXZlbHksIHlvdSBj YW4gcHJldmVudCBicmlkZ2VkIHRyYWZmaWMgZ2V0dGluZyBwdXNoZWQgdGhyb3VnaApJbmRleDog eGVuLXVuc3RhYmxlLmhnL2RvY3MvbWlzYy9zeXNjb25maWcudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIC9k ZXYvbnVsbAkxOTcwLTAxLTAxIDAwOjAwOjAwLjAwMDAwMDAwMCArMDAwMAorKysgeGVuLXVuc3Rh YmxlLmhnL2RvY3MvbWlzYy9zeXNjb25maWcudHh0CTIwMTAtMDktMTMgMTA6NDU6MTEuMDAwMDAw MDAwIC0wNzAwCkBAIC0wLDAgKzEsMTQgQEAKK1RoaXMgZGVzY3JpYmVzIHRoZSB1c2Ugb2YgdGhl IDxTWVNDT05GSUc+IGFuZCA8U1VCU1lTPiB2YXJpYWJsZXMuCisKK1JlZCBoYXQgYW5kIG1vc3Qg b3RoZXIgUlBNIGJhc2VkIGRpc3Ryb3MgdXNlIC9ldGMvc3lzY29uZmlnIGZvciBjb25maWd1cmF0 aW9uIGRhdGEuCisKK0RlYmlhbiBhbmQgb3RoZXIgZGVyaXZhdGl2ZSBkaXN0cm9zIHVzZSAvZXRj L2RlZmF1bHQgZm9yIHRoaXMgc2FtZSBkYXRhLgorCitUaGUgc2FtZSBhcHBsaWVzIHRvIC92YXIv c3Vic3lzIGFuZCAvdmFyLiBSZWQgSGF0IHVzZXMgdGhlIGZvcm1lciBhbmQgRGViaWFuIHRoZSBs YXR0ZXIuCisKK1RoZXNlIGRpZmZlcmVuY2VzIGFyZSBoYW5kbGVkIGJ5IHRoZSBYRU5fQ09ORklH X0FSQ0ggYnVpbGQgdGltZSB2YXJpYWJsZS4gVGhlIGRlZmF1bHQgaXMgZm9yIHRoZSBSZWQgSGF0 IGNvbmZpZ3VyYXRpb24uIERlYmlhbiBhbmQgb3RoZXIgZGVyaXZhdGl2ZXMgbmVlZCB0byBzZXQg dGhpcyB2YXJpYWJsZSB0byAiZGVmYXVsdCIgaW4gdGhlIGJ1aWxkIHNoZWxsJ3MgZW52aXJvbm1l bnQuCisKK2VnOgorCitYRU5fQ09ORklHX0FSQ0g9IiIgbWFrZSBkaXN0CisKSW5kZXg6IHhlbi11 bnN0YWJsZS5oZy90b29scy92bmV0L2RvYy92bmV0LXhlbmQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhl bi11bnN0YWJsZS5oZy5vcmlnL3Rvb2xzL3ZuZXQvZG9jL3ZuZXQteGVuZC50eHQJMjAxMC0wOS0x MyAxMDo0NDo0OS4wMDAwMDAwMDAgLTA3MDAKKysrIHhlbi11bnN0YWJsZS5oZy90b29scy92bmV0 L2RvYy92bmV0LXhlbmQudHh0CTIwMTAtMDktMTMgMTA6NDU6MTEuMDAwMDAwMDAwIC0wNzAwCkBA IC03OSw4ICs3OSw4IEBACiAKIE1UVT0xNDAwCiAKLWluIC9ldGMvc3lzY29uZmlnL25ldHdvcmst c2NyaXB0cy9pZmNmZy1ldGgwLiBZb3UgbWF5IGFsc28gaGF2ZSB0byBjaGFuZ2Ugb3IgcmVtb3Zl Ci1jYWNoZWQgY29uZmlnIGZpbGVzIGZvciBldGgwIHVuZGVyIC9ldGMvc3lzY29uZmlnL25ldHdv cmtpbmcuCitpbiA8U1lTQ09ORklHPi9uZXR3b3JrLXNjcmlwdHMvaWZjZmctZXRoMC4gWW91IG1h eSBhbHNvIGhhdmUgdG8gY2hhbmdlIG9yIHJlbW92ZQorY2FjaGVkIGNvbmZpZyBmaWxlcyBmb3Ig ZXRoMCB1bmRlciA8U1lTQ09ORklHPi9uZXR3b3JraW5nLgogCiBPbmNlIGNvbmZpZ3VyZWQsIHZu ZXRzIGFyZSBwZXJzaXN0ZW50IGluIHRoZSB4ZW5kIGRhdGFiYXNlLgogVG8gcmVtb3ZlIGEgdm5l dCB1c2UKSW5kZXg6IHhlbi11bnN0YWJsZS5oZy90b29scy94ZW5iYWxsb29uL3hlbmJhbGxvb25k LmluaXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0geGVuLXVuc3RhYmxlLmhnLm9yaWcvdG9vbHMveGVuYmFsbG9v bi94ZW5iYWxsb29uZC5pbml0CTIwMTAtMDktMTMgMTA6NDQ6NDkuMDAwMDAwMDAwIC0wNzAwCisr KyB4ZW4tdW5zdGFibGUuaGcvdG9vbHMveGVuYmFsbG9vbi94ZW5iYWxsb29uZC5pbml0CTIwMTAt MDktMTMgMTA6NDU6MTEuMDAwMDAwMDAwIC0wNzAwCkBAIC0yOSw2ICsyOSwxMCBAQAogCiBpZiBb IC1mIC9ldGMvc3lzY29uZmlnL3hlbmJhbGxvb24uY29uZiBdOyB0aGVuCiAJLiAvZXRjL3N5c2Nv bmZpZy94ZW5iYWxsb29uLmNvbmYKK2Vsc2UKKwlpZiBbIC1mIC9ldGMvZGVmYXVsdC94ZW5iYWxs b29uLmNvbmYgXTsgdGhlbgorCQkuIC9ldGMvZGVmYXVsdC94ZW5iYWxsb29uLmNvbmYKKwlmaQog ZmkKIAogIyBDaGVjayB0aGF0IGJhbGxvb24gZHJpdmVyIGlzIHByZXNlbnQKSW5kZXg6IHhlbi11 bnN0YWJsZS5oZy90b29scy94ZW5iYWxsb29uL3hlbmJhbGxvb25kCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhl bi11bnN0YWJsZS5oZy5vcmlnL3Rvb2xzL3hlbmJhbGxvb24veGVuYmFsbG9vbmQJMjAxMC0wOS0x MyAxMDo0NDo0OS4wMDAwMDAwMDAgLTA3MDAKKysrIHhlbi11bnN0YWJsZS5oZy90b29scy94ZW5i YWxsb29uL3hlbmJhbGxvb25kCTIwMTAtMDktMTMgMTA6NDU6MTEuMDAwMDAwMDAwIC0wNzAwCkBA IC0yMSw3ICsyMSw3IEBACiAjIElmIHhlbmJ1cyBpcyBydW5uaW5nIGFuZCB0aGUgL3Vzci9iaW4v eGVuc3RvcmUtKiB0b29scyBhcmUgaW5zdGFsbGVkLAogIyAieGVuYnVzIGlzIGVuYWJsZWQiLgog IwotIyBQYXJhbWV0ZXJzIGFyZSBkb2N1bWVudGVkIGluIC9ldGMvc3lzY29uZmlnL3hlbmJhbGxv b24uY29uZi4gQWx0aG91Z2ggCisjIFBhcmFtZXRlcnMgYXJlIGRvY3VtZW50ZWQgaW4gPFNZU0NP TkZJRz4veGVuYmFsbG9vbi5jb25mLiBBbHRob3VnaAogIyBzb21lIGFyZSBub3QgdXNlZCB3aXRo IGRpcmVjdGVkIGJhbGxvb25pbmcsIGFsbCBtdXN0IGJlIHNldCBwcm9wZXJseS4KICMgSWYgeGVu YnVzIGlzIGVuYWJsZWQsIHNvbWUgb2YgdGhlc2UgcGFyYW1ldGVycyBtYXkgYmUgb3ZlcnJpZGRl biBieSB2YWx1ZXMKICMgc2V0IGJ5IGRvbWFpbjAgdmlhIHhlbmJ1cy4KQEAgLTIzNyw3ICsyMzcs MTMgQEAKIGZpCiBwcmVzd2Fwbm93PTAKIAotLiAvZXRjL3N5c2NvbmZpZy94ZW5iYWxsb29uLmNv bmYKK2lmIFsgLWYgL2V0Yy9zeXNjb25maWcveGVuYmFsbG9vbi5jb25mIF07IHRoZW4KKwkuIC9l dGMvc3lzY29uZmlneGVuYmFsbG9vbi5jb25mCitlbHNlCisJaWYgWyAtZiAvZXRjL2RlZmF1bHQv eGVuYmFsbG9vbi5jb25mIF07IHRoZW4KKwkJLiAvZXRjL2RlZmF1bHQveGVuYmFsbG9vbi5jb25m CisJZmkKK2ZpCiAKIHdoaWxlIHRydWU7CiBkbwpJbmRleDogeGVuLXVuc3RhYmxlLmhnL3Rvb2xz L3hlbmJhbGxvb24veGVuYmFsbG9vbmQuUkVBRE1FCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhlbi11bnN0YWJs ZS5oZy5vcmlnL3Rvb2xzL3hlbmJhbGxvb24veGVuYmFsbG9vbmQuUkVBRE1FCTIwMTAtMDktMTMg MTA6NDQ6NDkuMDAwMDAwMDAwIC0wNzAwCisrKyB4ZW4tdW5zdGFibGUuaGcvdG9vbHMveGVuYmFs bG9vbi94ZW5iYWxsb29uZC5SRUFETUUJMjAxMC0wOS0xMyAxMDo0NToxMS4wMDAwMDAwMDAgLTA3 MDAKQEAgLTU5LDEwICs1OSwxMCBAQAogSW5zdHJ1Y3Rpb25zIHRvIGluc3RhbGwvZGVwbG95IHhl bmJhbGxvb25kIChpbiBSZWRoYXQtYmFzZWQgc3lzdGVtKToKIC0gaW4gZWFjaCBndWVzdDoKICAg LSBlbnN1cmUgcHJlLXJlcXVpc2l0ZXMgYXJlIG1ldCAoc2VlIGFib3ZlKQotICAtIHBsYWNlIHhl bmJhbGxvb24uY29uZiBpbiAvZXRjL3N5c2NvbmZpZworICAtIHBsYWNlIHhlbmJhbGxvb24uY29u ZiBpbiA8U1lTQ09ORklHPgogICAtIHBsYWNlIHhlbmJhbGxvb25kIGluIC91c3Ivc2JpbgogICAt IGNvcHkgeGVuYmFsbG9vbmQuaW5pdCB0byAvZXRjL3JjLmQvaW5pdC5kL3hlbmJhbGxvb25kIChu b3RlIGZpbGUgcmVuYW1lKQotICAtIGVkaXQgL2V0Yy9zeXNjb25maWcveGVuYmFsbG9vbmQuY29u ZiBhcyBkZXNpcmVkIChlc3BlY2lhbGx5IG5vdGUgdGhhdAorICAtIGVkaXQgPFNZU0NPTkZJRz4v eGVuYmFsbG9vbmQuY29uZiBhcyBkZXNpcmVkIChlc3BlY2lhbGx5IG5vdGUgdGhhdAogICAgIHNl bGZiYWxsb29uaW5nIGRlZmF1bHRzIGFzIG9mZikKICAgLSBzdGFydCB4ZW5iYWxsb29uZCB3aXRo ICJzZXJ2aWNlIHhlbmJhbGxvb25kIHN0YXJ0IiwgYW5kL29yIGNvbmZpZ3VyZQogICAgIHhlbmJh bGxvb25kIHRvIHN0YXJ0IGF0IGluaXQgKGUuZy4gImNoa2NvbmZpZyB4ZW5iYWxsb29uZCBvbiIp CkluZGV4OiB4ZW4tdW5zdGFibGUuaGcvdG9vbHMvaG90cGx1Zy9MaW51eC9pbml0LmQveGVuZG9t YWlucwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSB4ZW4tdW5zdGFibGUuaGcub3JpZy90b29scy9ob3RwbHVnL0xp bnV4L2luaXQuZC94ZW5kb21haW5zCTIwMTAtMDktMTMgMTA6NDQ6NDguMDAwMDAwMDAwIC0wNzAw CisrKyB4ZW4tdW5zdGFibGUuaGcvdG9vbHMvaG90cGx1Zy9MaW51eC9pbml0LmQveGVuZG9tYWlu cwkyMDEwLTA5LTEzIDEwOjQ1OjExLjAwMDAwMDAwMCAtMDcwMApAQCAtNDYsOSArNDYsMTMgQEAK IAlleGl0IDAKIGZpCiAKLUxPQ0tGSUxFPS92YXIvbG9jay9zdWJzeXMveGVuZG9tYWlucwotWEVO RE9NX0NPTkZJRz0vZXRjL3N5c2NvbmZpZy94ZW5kb21haW5zCi0KK2lmIFsgLWQgL2V0Yy9zeXNj b25maWcgXTsgdGhlbgorCUxPQ0tGSUxFPS92YXIvbG9jay9zdWJzeXMveGVuZG9tYWlucworCVhF TkRPTV9DT05GSUc9L2V0Yy9zeXNjb25maWcveGVuZG9tYWlucworZWxzZQorCUxPQ0tGSUxFPS92 YXIvbG9jay94ZW5kb21haW5zCisJWEVORE9NX0NPTkZJRz0vZXRjL2RlZmF1bHQveGVuZG9tYWlu cworZmkKIHRlc3QgLXIgJFhFTkRPTV9DT05GSUcgfHwgeyBlY2hvICIkWEVORE9NX0NPTkZJRyBu b3QgZXhpc3RpbmciOwogCWlmIFsgIiQxIiA9ICJzdG9wIiBdOyB0aGVuIGV4aXQgMDsKIAllbHNl IGV4aXQgNjsgZmk7IH0KSW5kZXg6IHhlbi11bnN0YWJsZS5oZy90b29scy9ob3RwbHVnL0xpbnV4 L2luaXQuZC94ZW5kCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHhlbi11bnN0YWJsZS5oZy5vcmlnL3Rvb2xzL2hv dHBsdWcvTGludXgvaW5pdC5kL3hlbmQJMjAxMC0wOS0xMyAxMzo1MzoxOS4wMDAwMDAwMDAgLTA3 MDAKKysrIHhlbi11bnN0YWJsZS5oZy90b29scy9ob3RwbHVnL0xpbnV4L2luaXQuZC94ZW5kCTIw MTAtMDktMTMgMTM6NTY6NTIuMDAwMDAwMDAwIC0wNzAwCkBAIC00MCwxNCArNDAsMjAgQEAKIAkJ ZWNobyAieGVuY29tbW9ucyBzaG91bGQgYmUgc3RhcnRlZCBmaXJzdC4iCiAJCWV4aXQgMQogCWZp Ci0JbWtkaXIgLXAgL3Zhci9sb2NrL3N1YnN5cwotCXRvdWNoIC92YXIvbG9jay9zdWJzeXMveGVu ZAorCSMgbWtkaXIgc2hvdWxkbid0IGJlIG5lZWRlZCBhcyBtb3N0IGRpc3Ryb3MgaGF2ZSB0aGlz IGFscmVhZHkgY3JlYXRlZC4gRGVmYXVsdCB0byB1c2luZyBzdWJzeXMuCisJIyBUaGlzIG1ha2Vz IGl0IFJlZCBIYWQvRGViaWFuIGFnbm9zdGljCisJbWtkaXIgLXAgL3Zhci9sb2NrCisJaWYgWyAt ZCAvdmFyL2xvY2svc3Vic3lzIF0gOyB0aGVuCisJCXRvdWNoIC92YXIvbG9jay9zdWJzeXMveGVu ZAorCWVsc2UKKwkJdG91Y2ggL3Zhci9sb2NrL3hlbmQKKwlmaQogCXhlbmQgc3RhcnQKIAlhd2Fp dF9kYWVtb25zX3VwCiAJOzsKICAgc3RvcCkKIAl4ZW5kIHN0b3AKLQlybSAtZiAvdmFyL2xvY2sv c3Vic3lzL3hlbmQKKwlybSAtZiAvdmFyL2xvY2svc3Vic3lzL3hlbmQgL3Zhci9sb2NrL3hlbmQK IAk7OwogICBzdGF0dXMpCiAJeGVuZCBzdGF0dXMK --0016e6480d3235a8c504902cce65 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 --0016e6480d3235a8c504902cce65--