From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49831)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sstabellini@kernel.org>) id 1cobsP-0005XZ-5A
	for qemu-devel@nongnu.org; Thu, 16 Mar 2017 16:20:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sstabellini@kernel.org>) id 1cobsL-0001Xt-4K
	for qemu-devel@nongnu.org; Thu, 16 Mar 2017 16:20:01 -0400
Received: from mail.kernel.org ([198.145.29.136]:48224)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <sstabellini@kernel.org>)
	id 1cobsK-0001Xl-QM
	for qemu-devel@nongnu.org; Thu, 16 Mar 2017 16:19:57 -0400
Date: Thu, 16 Mar 2017 13:19:51 -0700 (PDT)
From: Stefano Stabellini <sstabellini@kernel.org>
In-Reply-To: <20170316141953.16161-2-jgross@suse.com>
Message-ID: <alpine.DEB.2.10.1703161312390.15430@sstabellini-ThinkPad-X260>
References: <20170316141953.16161-1-jgross@suse.com>
	<20170316141953.16161-2-jgross@suse.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: Re: [Qemu-devel] [PATCH 1/2] xen: use 5 digit xen versions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Juergen Gross <jgross@suse.com>
Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, anthony.perard@citrix.com, kraxel@redhat.com, sstabellini@kernel.org, paul.durrant@citrix.com

On Thu, 16 Mar 2017, Juergen Gross wrote:
> Today qemu is using e.g. the value 480 for Xen version 4.8.0. As some
> Xen version tests are using ">" relations this scheme will lead to
> problems when Xen version 4.10.0 is being reached.
> 
> Instead of the 3 digit schem use a 5 digit scheme (e.g. 40800 for
> version 4.8.0).
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  configure                   | 16 ++++++++--------
>  hw/block/xen_disk.c         |  2 +-
>  include/hw/xen/xen_common.h | 22 +++++++++++-----------
>  3 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/configure b/configure
> index b187222..aabf098 100755
> --- a/configure
> +++ b/configure
> @@ -2001,7 +2001,7 @@ EOF
>        compile_prog "" "$xen_libs $xen_stable_libs -lxendevicemodel"
>      then
>      xen_stable_libs="$xen_stable_libs -lxendevicemodel"
> -    xen_ctrl_version=490
> +    xen_ctrl_version=40900
>      xen=yes
>    elif
>        cat > $TMPC <<EOF &&
> @@ -2056,7 +2056,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs $xen_stable_libs"
>      then
> -    xen_ctrl_version=480
> +    xen_ctrl_version=40800
>      xen=yes
>    elif
>        cat > $TMPC <<EOF &&
> @@ -2107,7 +2107,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs $xen_stable_libs"
>      then
> -    xen_ctrl_version=471
> +    xen_ctrl_version=40701
>      xen=yes
>    elif
>        cat > $TMPC <<EOF &&
> @@ -2122,7 +2122,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs"
>      then
> -    xen_ctrl_version=470
> +    xen_ctrl_version=40700
>      xen=yes
>  
>    # Xen 4.6
> @@ -2150,7 +2150,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs"
>      then
> -    xen_ctrl_version=460
> +    xen_ctrl_version=40600
>      xen=yes
>  
>    # Xen 4.5
> @@ -2177,7 +2177,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs"
>      then
> -    xen_ctrl_version=450
> +    xen_ctrl_version=40500
>      xen=yes
>  
>    elif
> @@ -2202,7 +2202,7 @@ int main(void) {
>  EOF
>        compile_prog "" "$xen_libs"
>      then
> -    xen_ctrl_version=420
> +    xen_ctrl_version=40200
>      xen=yes
>  
>    else
> @@ -2214,7 +2214,7 @@ EOF
>    fi
>  
>    if test "$xen" = yes; then
> -    if test $xen_ctrl_version -ge 471  ; then
> +    if test $xen_ctrl_version -ge 40701  ; then
>        libs_softmmu="$xen_stable_libs $libs_softmmu"
>      fi
>      libs_softmmu="$xen_libs $libs_softmmu"
> diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
> index 456a2d5..27df048 100644
> --- a/hw/block/xen_disk.c
> +++ b/hw/block/xen_disk.c
> @@ -492,7 +492,7 @@ static int ioreq_map(struct ioreq *ioreq)
>      return 0;
>  }
>  
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 480
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40800
>  
>  static void ioreq_free_copy_buffers(struct ioreq *ioreq)
>  {
> diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
> index 274accc..df098c7 100644
> --- a/include/hw/xen/xen_common.h
> +++ b/include/hw/xen/xen_common.h
> @@ -27,7 +27,7 @@ extern xc_interface *xen_xc;
>   * We don't support Xen prior to 4.2.0.
>   */
>  
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 490
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900
>  
>  typedef xc_interface xendevicemodel_handle;
>  
> @@ -37,7 +37,7 @@ static inline xendevicemodel_handle *xendevicemodel_open(
>      return xen_xc;
>  }
>  
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 450
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40500
>  
>  static inline int xendevicemodel_create_ioreq_server(
>      xendevicemodel_handle *dmod, domid_t domid, int handle_bufioreq,
> @@ -100,7 +100,7 @@ static inline int xendevicemodel_set_ioreq_server_state(
>      return xc_hvm_set_ioreq_server_state(dmod, domid, id, enabled);
>  }
>  
> -#endif /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 450 */
> +#endif /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40500 */
>  
>  static inline int xendevicemodel_set_pci_intx_level(
>      xendevicemodel_handle *dmod, domid_t domid, uint16_t segment,
> @@ -152,7 +152,7 @@ static inline int xendevicemodel_set_mem_type(
>      return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr);
>  }
>  
> -#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 490 */
> +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */
>  
>  #include <xendevicemodel.h>
>  
> @@ -207,7 +207,7 @@ static inline int xen_modified_memory(domid_t domid, uint64_t first_pfn,
>  }
>  
>  /* Xen 4.2 through 4.6 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40701
>  
>  typedef xc_interface xenforeignmemory_handle;
>  typedef xc_evtchn xenevtchn_handle;
> @@ -248,7 +248,7 @@ static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
>  
>  #define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)
>  
> -#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */
> +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40701 */
>  
>  #include <xenevtchn.h>
>  #include <xengnttab.h>
> @@ -284,7 +284,7 @@ static inline int xen_get_vmport_regs_pfn(xc_interface *xc, domid_t dom,
>  #endif
>  
>  /* Xen before 4.6 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40600
>  
>  #ifndef HVM_IOREQSRV_BUFIOREQ_ATOMIC
>  #define HVM_IOREQSRV_BUFIOREQ_ATOMIC 2
> @@ -330,7 +330,7 @@ static inline int xen_get_default_ioreq_server_info(domid_t dom,
>  }
>  
>  /* Xen before 4.5 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40500
>  
>  #ifndef HVM_PARAM_BUFIOREQ_EVTCHN
>  #define HVM_PARAM_BUFIOREQ_EVTCHN 26
> @@ -569,7 +569,7 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
>  
>  #endif
>  
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40600
>  static inline int xen_xc_domain_add_to_physmap(xc_interface *xch, uint32_t domid,
>                                                 unsigned int space,
>                                                 unsigned long idx,
> @@ -592,7 +592,7 @@ static inline int xen_xc_domain_add_to_physmap(xc_interface *xch, uint32_t domid
>  #endif
>  
>  #ifdef CONFIG_XEN_PV_DOMAIN_BUILD
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40700
>  static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
>                                      xen_domain_handle_t handle, uint32_t flags,
>                                      uint32_t *pdomid)
> @@ -611,7 +611,7 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
>  
>  /* Xen before 4.8 */
>  
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 480
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40800
>  
>  
>  typedef void *xengnttab_grant_copy_segment_t;
> -- 
> 2.10.2
> 

From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <sstabellini@kernel.org>
Subject: Re: [PATCH 1/2] xen: use 5 digit xen versions
Date: Thu, 16 Mar 2017 13:19:51 -0700 (PDT)
Message-ID: <alpine.DEB.2.10.1703161312390.15430@sstabellini-ThinkPad-X260>
References: <20170316141953.16161-1-jgross@suse.com>
 <20170316141953.16161-2-jgross@suse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
 by lists.xenproject.org with esmtp (Exim 4.84_2)
 (envelope-from <sstabellini@kernel.org>) id 1cobsM-0007uO-T4
 for xen-devel@lists.xenproject.org; Thu, 16 Mar 2017 20:19:58 +0000
In-Reply-To: <20170316141953.16161-2-jgross@suse.com>
List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: Juergen Gross <jgross@suse.com>
Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, paul.durrant@citrix.com, kraxel@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org
List-Id: xen-devel@lists.xenproject.org

T24gVGh1LCAxNiBNYXIgMjAxNywgSnVlcmdlbiBHcm9zcyB3cm90ZToKPiBUb2RheSBxZW11IGlz
IHVzaW5nIGUuZy4gdGhlIHZhbHVlIDQ4MCBmb3IgWGVuIHZlcnNpb24gNC44LjAuIEFzIHNvbWUK
PiBYZW4gdmVyc2lvbiB0ZXN0cyBhcmUgdXNpbmcgIj4iIHJlbGF0aW9ucyB0aGlzIHNjaGVtZSB3
aWxsIGxlYWQgdG8KPiBwcm9ibGVtcyB3aGVuIFhlbiB2ZXJzaW9uIDQuMTAuMCBpcyBiZWluZyBy
ZWFjaGVkLgo+IAo+IEluc3RlYWQgb2YgdGhlIDMgZGlnaXQgc2NoZW0gdXNlIGEgNSBkaWdpdCBz
Y2hlbWUgKGUuZy4gNDA4MDAgZm9yCj4gdmVyc2lvbiA0LjguMCkuCj4gCj4gU2lnbmVkLW9mZi1i
eTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgoKUmV2aWV3ZWQtYnk6IFN0ZWZhbm8g
U3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KCgo+IC0tLQo+ICBjb25maWd1cmUg
ICAgICAgICAgICAgICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCj4gIGh3L2Jsb2NrL3hlbl9k
aXNrLmMgICAgICAgICB8ICAyICstCj4gIGluY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCB8IDIy
ICsrKysrKysrKysrLS0tLS0tLS0tLS0KPiAgMyBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25z
KCspLCAyMCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmln
dXJlCj4gaW5kZXggYjE4NzIyMi4uYWFiZjA5OCAxMDA3NTUKPiAtLS0gYS9jb25maWd1cmUKPiAr
KysgYi9jb25maWd1cmUKPiBAQCAtMjAwMSw3ICsyMDAxLDcgQEAgRU9GCj4gICAgICAgIGNvbXBp
bGVfcHJvZyAiIiAiJHhlbl9saWJzICR4ZW5fc3RhYmxlX2xpYnMgLWx4ZW5kZXZpY2Vtb2RlbCIK
PiAgICAgIHRoZW4KPiAgICAgIHhlbl9zdGFibGVfbGlicz0iJHhlbl9zdGFibGVfbGlicyAtbHhl
bmRldmljZW1vZGVsIgo+IC0gICAgeGVuX2N0cmxfdmVyc2lvbj00OTAKPiArICAgIHhlbl9jdHJs
X3ZlcnNpb249NDA5MDAKPiAgICAgIHhlbj15ZXMKPiAgICBlbGlmCj4gICAgICAgIGNhdCA+ICRU
TVBDIDw8RU9GICYmCj4gQEAgLTIwNTYsNyArMjA1Niw3IEBAIGludCBtYWluKHZvaWQpIHsKPiAg
RU9GCj4gICAgICAgIGNvbXBpbGVfcHJvZyAiIiAiJHhlbl9saWJzICR4ZW5fc3RhYmxlX2xpYnMi
Cj4gICAgICB0aGVuCj4gLSAgICB4ZW5fY3RybF92ZXJzaW9uPTQ4MAo+ICsgICAgeGVuX2N0cmxf
dmVyc2lvbj00MDgwMAo+ICAgICAgeGVuPXllcwo+ICAgIGVsaWYKPiAgICAgICAgY2F0ID4gJFRN
UEMgPDxFT0YgJiYKPiBAQCAtMjEwNyw3ICsyMTA3LDcgQEAgaW50IG1haW4odm9pZCkgewo+ICBF
T0YKPiAgICAgICAgY29tcGlsZV9wcm9nICIiICIkeGVuX2xpYnMgJHhlbl9zdGFibGVfbGlicyIK
PiAgICAgIHRoZW4KPiAtICAgIHhlbl9jdHJsX3ZlcnNpb249NDcxCj4gKyAgICB4ZW5fY3RybF92
ZXJzaW9uPTQwNzAxCj4gICAgICB4ZW49eWVzCj4gICAgZWxpZgo+ICAgICAgICBjYXQgPiAkVE1Q
QyA8PEVPRiAmJgo+IEBAIC0yMTIyLDcgKzIxMjIsNyBAQCBpbnQgbWFpbih2b2lkKSB7Cj4gIEVP
Rgo+ICAgICAgICBjb21waWxlX3Byb2cgIiIgIiR4ZW5fbGlicyIKPiAgICAgIHRoZW4KPiAtICAg
IHhlbl9jdHJsX3ZlcnNpb249NDcwCj4gKyAgICB4ZW5fY3RybF92ZXJzaW9uPTQwNzAwCj4gICAg
ICB4ZW49eWVzCj4gIAo+ICAgICMgWGVuIDQuNgo+IEBAIC0yMTUwLDcgKzIxNTAsNyBAQCBpbnQg
bWFpbih2b2lkKSB7Cj4gIEVPRgo+ICAgICAgICBjb21waWxlX3Byb2cgIiIgIiR4ZW5fbGlicyIK
PiAgICAgIHRoZW4KPiAtICAgIHhlbl9jdHJsX3ZlcnNpb249NDYwCj4gKyAgICB4ZW5fY3RybF92
ZXJzaW9uPTQwNjAwCj4gICAgICB4ZW49eWVzCj4gIAo+ICAgICMgWGVuIDQuNQo+IEBAIC0yMTc3
LDcgKzIxNzcsNyBAQCBpbnQgbWFpbih2b2lkKSB7Cj4gIEVPRgo+ICAgICAgICBjb21waWxlX3By
b2cgIiIgIiR4ZW5fbGlicyIKPiAgICAgIHRoZW4KPiAtICAgIHhlbl9jdHJsX3ZlcnNpb249NDUw
Cj4gKyAgICB4ZW5fY3RybF92ZXJzaW9uPTQwNTAwCj4gICAgICB4ZW49eWVzCj4gIAo+ICAgIGVs
aWYKPiBAQCAtMjIwMiw3ICsyMjAyLDcgQEAgaW50IG1haW4odm9pZCkgewo+ICBFT0YKPiAgICAg
ICAgY29tcGlsZV9wcm9nICIiICIkeGVuX2xpYnMiCj4gICAgICB0aGVuCj4gLSAgICB4ZW5fY3Ry
bF92ZXJzaW9uPTQyMAo+ICsgICAgeGVuX2N0cmxfdmVyc2lvbj00MDIwMAo+ICAgICAgeGVuPXll
cwo+ICAKPiAgICBlbHNlCj4gQEAgLTIyMTQsNyArMjIxNCw3IEBAIEVPRgo+ICAgIGZpCj4gIAo+
ICAgIGlmIHRlc3QgIiR4ZW4iID0geWVzOyB0aGVuCj4gLSAgICBpZiB0ZXN0ICR4ZW5fY3RybF92
ZXJzaW9uIC1nZSA0NzEgIDsgdGhlbgo+ICsgICAgaWYgdGVzdCAkeGVuX2N0cmxfdmVyc2lvbiAt
Z2UgNDA3MDEgIDsgdGhlbgo+ICAgICAgICBsaWJzX3NvZnRtbXU9IiR4ZW5fc3RhYmxlX2xpYnMg
JGxpYnNfc29mdG1tdSIKPiAgICAgIGZpCj4gICAgICBsaWJzX3NvZnRtbXU9IiR4ZW5fbGlicyAk
bGlic19zb2Z0bW11Igo+IGRpZmYgLS1naXQgYS9ody9ibG9jay94ZW5fZGlzay5jIGIvaHcvYmxv
Y2sveGVuX2Rpc2suYwo+IGluZGV4IDQ1NmEyZDUuLjI3ZGYwNDggMTAwNjQ0Cj4gLS0tIGEvaHcv
YmxvY2sveGVuX2Rpc2suYwo+ICsrKyBiL2h3L2Jsb2NrL3hlbl9kaXNrLmMKPiBAQCAtNDkyLDcg
KzQ5Miw3IEBAIHN0YXRpYyBpbnQgaW9yZXFfbWFwKHN0cnVjdCBpb3JlcSAqaW9yZXEpCj4gICAg
ICByZXR1cm4gMDsKPiAgfQo+ICAKPiAtI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVS
U0lPTiA+PSA0ODAKPiArI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA+PSA0
MDgwMAo+ICAKPiAgc3RhdGljIHZvaWQgaW9yZXFfZnJlZV9jb3B5X2J1ZmZlcnMoc3RydWN0IGlv
cmVxICppb3JlcSkKPiAgewo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9u
LmggYi9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKPiBpbmRleCAyNzRhY2NjLi5kZjA5OGM3
IDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaAo+ICsrKyBiL2luY2x1
ZGUvaHcveGVuL3hlbl9jb21tb24uaAo+IEBAIC0yNyw3ICsyNyw3IEBAIGV4dGVybiB4Y19pbnRl
cmZhY2UgKnhlbl94YzsKPiAgICogV2UgZG9uJ3Qgc3VwcG9ydCBYZW4gcHJpb3IgdG8gNC4yLjAu
Cj4gICAqLwo+ICAKPiAtI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQ5
MAo+ICsjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OIDwgNDA5MDAKPiAgCj4g
IHR5cGVkZWYgeGNfaW50ZXJmYWNlIHhlbmRldmljZW1vZGVsX2hhbmRsZTsKPiAgCj4gQEAgLTM3
LDcgKzM3LDcgQEAgc3RhdGljIGlubGluZSB4ZW5kZXZpY2Vtb2RlbF9oYW5kbGUgKnhlbmRldmlj
ZW1vZGVsX29wZW4oCj4gICAgICByZXR1cm4geGVuX3hjOwo+ICB9Cj4gIAo+IC0jaWYgQ09ORklH
X1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQ1MAo+ICsjaWYgQ09ORklHX1hFTl9DVFJM
X0lOVEVSRkFDRV9WRVJTSU9OID49IDQwNTAwCj4gIAo+ICBzdGF0aWMgaW5saW5lIGludCB4ZW5k
ZXZpY2Vtb2RlbF9jcmVhdGVfaW9yZXFfc2VydmVyKAo+ICAgICAgeGVuZGV2aWNlbW9kZWxfaGFu
ZGxlICpkbW9kLCBkb21pZF90IGRvbWlkLCBpbnQgaGFuZGxlX2J1ZmlvcmVxLAo+IEBAIC0xMDAs
NyArMTAwLDcgQEAgc3RhdGljIGlubGluZSBpbnQgeGVuZGV2aWNlbW9kZWxfc2V0X2lvcmVxX3Nl
cnZlcl9zdGF0ZSgKPiAgICAgIHJldHVybiB4Y19odm1fc2V0X2lvcmVxX3NlcnZlcl9zdGF0ZShk
bW9kLCBkb21pZCwgaWQsIGVuYWJsZWQpOwo+ICB9Cj4gIAo+IC0jZW5kaWYgLyogQ09ORklHX1hF
Tl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQ1MCAqLwo+ICsjZW5kaWYgLyogQ09ORklHX1hF
Tl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQwNTAwICovCj4gIAo+ICBzdGF0aWMgaW5saW5l
IGludCB4ZW5kZXZpY2Vtb2RlbF9zZXRfcGNpX2ludHhfbGV2ZWwoCj4gICAgICB4ZW5kZXZpY2Vt
b2RlbF9oYW5kbGUgKmRtb2QsIGRvbWlkX3QgZG9taWQsIHVpbnQxNl90IHNlZ21lbnQsCj4gQEAg
LTE1Miw3ICsxNTIsNyBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5kZXZpY2Vtb2RlbF9zZXRfbWVt
X3R5cGUoCj4gICAgICByZXR1cm4geGNfaHZtX3NldF9tZW1fdHlwZShkbW9kLCBkb21pZCwgbWVt
X3R5cGUsIGZpcnN0X3BmbiwgbnIpOwo+ICB9Cj4gIAo+IC0jZWxzZSAvKiBDT05GSUdfWEVOX0NU
UkxfSU5URVJGQUNFX1ZFUlNJT04gPj0gNDkwICovCj4gKyNlbHNlIC8qIENPTkZJR19YRU5fQ1RS
TF9JTlRFUkZBQ0VfVkVSU0lPTiA+PSA0MDkwMCAqLwo+ICAKPiAgI2luY2x1ZGUgPHhlbmRldmlj
ZW1vZGVsLmg+Cj4gIAo+IEBAIC0yMDcsNyArMjA3LDcgQEAgc3RhdGljIGlubGluZSBpbnQgeGVu
X21vZGlmaWVkX21lbW9yeShkb21pZF90IGRvbWlkLCB1aW50NjRfdCBmaXJzdF9wZm4sCj4gIH0K
PiAgCj4gIC8qIFhlbiA0LjIgdGhyb3VnaCA0LjYgKi8KPiAtI2lmIENPTkZJR19YRU5fQ1RSTF9J
TlRFUkZBQ0VfVkVSU0lPTiA8IDQ3MQo+ICsjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9W
RVJTSU9OIDwgNDA3MDEKPiAgCj4gIHR5cGVkZWYgeGNfaW50ZXJmYWNlIHhlbmZvcmVpZ25tZW1v
cnlfaGFuZGxlOwo+ICB0eXBlZGVmIHhjX2V2dGNobiB4ZW5ldnRjaG5faGFuZGxlOwo+IEBAIC0y
NDgsNyArMjQ4LDcgQEAgc3RhdGljIGlubGluZSB2b2lkICp4ZW5mb3JlaWdubWVtb3J5X21hcCh4
Y19pbnRlcmZhY2UgKmgsIHVpbnQzMl90IGRvbSwKPiAgCj4gICNkZWZpbmUgeGVuZm9yZWlnbm1l
bW9yeV91bm1hcChoLCBwLCBzKSBtdW5tYXAocCwgcyAqIFhDX1BBR0VfU0laRSkKPiAgCj4gLSNl
bHNlIC8qIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA+PSA0NzEgKi8KPiArI2Vs
c2UgLyogQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQwNzAxICovCj4gIAo+
ICAjaW5jbHVkZSA8eGVuZXZ0Y2huLmg+Cj4gICNpbmNsdWRlIDx4ZW5nbnR0YWIuaD4KPiBAQCAt
Mjg0LDcgKzI4NCw3IEBAIHN0YXRpYyBpbmxpbmUgaW50IHhlbl9nZXRfdm1wb3J0X3JlZ3NfcGZu
KHhjX2ludGVyZmFjZSAqeGMsIGRvbWlkX3QgZG9tLAo+ICAjZW5kaWYKPiAgCj4gIC8qIFhlbiBi
ZWZvcmUgNC42ICovCj4gLSNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJT04gPCA0
NjAKPiArI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQwNjAwCj4gIAo+
ICAjaWZuZGVmIEhWTV9JT1JFUVNSVl9CVUZJT1JFUV9BVE9NSUMKPiAgI2RlZmluZSBIVk1fSU9S
RVFTUlZfQlVGSU9SRVFfQVRPTUlDIDIKPiBAQCAtMzMwLDcgKzMzMCw3IEBAIHN0YXRpYyBpbmxp
bmUgaW50IHhlbl9nZXRfZGVmYXVsdF9pb3JlcV9zZXJ2ZXJfaW5mbyhkb21pZF90IGRvbSwKPiAg
fQo+ICAKPiAgLyogWGVuIGJlZm9yZSA0LjUgKi8KPiAtI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRF
UkZBQ0VfVkVSU0lPTiA8IDQ1MAo+ICsjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJT
SU9OIDwgNDA1MDAKPiAgCj4gICNpZm5kZWYgSFZNX1BBUkFNX0JVRklPUkVRX0VWVENITgo+ICAj
ZGVmaW5lIEhWTV9QQVJBTV9CVUZJT1JFUV9FVlRDSE4gMjYKPiBAQCAtNTY5LDcgKzU2OSw3IEBA
IHN0YXRpYyBpbmxpbmUgaW50IHhlbl9zZXRfaW9yZXFfc2VydmVyX3N0YXRlKGRvbWlkX3QgZG9t
LAo+ICAKPiAgI2VuZGlmCj4gIAo+IC0jaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJT
SU9OIDwgNDYwCj4gKyNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJT04gPCA0MDYw
MAo+ICBzdGF0aWMgaW5saW5lIGludCB4ZW5feGNfZG9tYWluX2FkZF90b19waHlzbWFwKHhjX2lu
dGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKPiAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgc3BhY2UsCj4gICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBpZHgsCj4g
QEAgLTU5Miw3ICs1OTIsNyBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5feGNfZG9tYWluX2FkZF90
b19waHlzbWFwKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZAo+ICAjZW5kaWYKPiAg
Cj4gICNpZmRlZiBDT05GSUdfWEVOX1BWX0RPTUFJTl9CVUlMRAo+IC0jaWYgQ09ORklHX1hFTl9D
VFJMX0lOVEVSRkFDRV9WRVJTSU9OIDwgNDcwCj4gKyNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJG
QUNFX1ZFUlNJT04gPCA0MDcwMAo+ICBzdGF0aWMgaW5saW5lIGludCB4ZW5fZG9tYWluX2NyZWF0
ZSh4Y19pbnRlcmZhY2UgKnhjLCB1aW50MzJfdCBzc2lkcmVmLAo+ICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICB4ZW5fZG9tYWluX2hhbmRsZV90IGhhbmRsZSwgdWludDMyX3Qg
ZmxhZ3MsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90ICpw
ZG9taWQpCj4gQEAgLTYxMSw3ICs2MTEsNyBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5fZG9tYWlu
X2NyZWF0ZSh4Y19pbnRlcmZhY2UgKnhjLCB1aW50MzJfdCBzc2lkcmVmLAo+ICAKPiAgLyogWGVu
IGJlZm9yZSA0LjggKi8KPiAgCj4gLSNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJ
T04gPCA0ODAKPiArI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQwODAw
Cj4gIAo+ICAKPiAgdHlwZWRlZiB2b2lkICp4ZW5nbnR0YWJfZ3JhbnRfY29weV9zZWdtZW50X3Q7
Cj4gLS0gCj4gMi4xMC4yCj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn
Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK