[PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status

[PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status

[Kamil Dziezyk]

Fix for hostname setting in vif-nat script was merged in xen upstream repo,
(sha: 5499e0fc8082024bf7e2d0facd5c976e82105070),
hence correct patch status for 4.14 is 'Backport'.

Issue-Id: SCM-1523
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I35f04bfa0f0fff81a1ef20d500b9323e5f13b9ed
---
 .../xen-tools/0001-vif-nat-fix-hostname.patch | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
index 87f25e2..d2e52ce 100644
--- a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
+++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
@@ -1,18 +1,34 @@
-Upstream-Status: Pending
+Upstream-Status: Backport
 Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
+
+From 5499e0fc8082024bf7e2d0facd5c976e82105070 Mon Sep 17 00:00:00 2001
+From: Diego Sueiro <diego.sueiro@arm.com>
+Date: Thu, 20 Aug 2020 11:58:20 +0100
+Subject: [PATCH] tools/hotplug: Fix hostname setting in vif-nat
 
 Setting the hostname is failing because the "$XENBUS_PATH/domain"
 doesn't exist anymore. To fix this we set it to dom$domid
 
-Index: git/tools/hotplug/Linux/vif-nat
-===================================================================
---- git.orig/tools/hotplug/Linux/vif-nat
-+++ git/tools/hotplug/Linux/vif-nat
-@@ -86,6 +86,7 @@ router_ip=$(routing_ip "$ip")
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
+Acked-by: Wei Liu <wl@xen.org>
+---
+ tools/hotplug/Linux/vif-nat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat
+index a76d9c784b..26144350b3 100644
+--- a/tools/hotplug/Linux/vif-nat
++++ b/tools/hotplug/Linux/vif-nat
+@@ -85,7 +85,7 @@ router_ip=$(routing_ip "$ip")
+ # Split the given IP/bits pair.
  vif_ip=`echo ${ip} | awk -F/ '{print $1}'`
  
- hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----')
-+[ -z "${hostname}" ] && hostname=dom$domid
+-hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----')
++hostname=dom$domid
  if [ "$vifid" != "1" ]
  then
    hostname="$hostname-$vifid"
+-- 
+2.17.1
-- 
2.17.1

Re: [meta-arm] [PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status

[Jon Mason]

On Tue, Dec 08, 2020 at 11:17:13AM +0100, Kamil Dziezyk wrote:
> Fix for hostname setting in vif-nat script was merged in xen upstream repo,
> (sha: 5499e0fc8082024bf7e2d0facd5c976e82105070),
> hence correct patch status for 4.14 is 'Backport'.
> 
> Issue-Id: SCM-1523
> Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
> Change-Id: I35f04bfa0f0fff81a1ef20d500b9323e5f13b9ed

Both patches applied to master.

Thanks,
Jon

> ---
>  .../xen-tools/0001-vif-nat-fix-hostname.patch | 32 ++++++++++++++-----
>  1 file changed, 24 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
> index 87f25e2..d2e52ce 100644
> --- a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
> +++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch
> @@ -1,18 +1,34 @@
> -Upstream-Status: Pending
> +Upstream-Status: Backport
>  Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> +Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
> +
> +From 5499e0fc8082024bf7e2d0facd5c976e82105070 Mon Sep 17 00:00:00 2001
> +From: Diego Sueiro <diego.sueiro@arm.com>
> +Date: Thu, 20 Aug 2020 11:58:20 +0100
> +Subject: [PATCH] tools/hotplug: Fix hostname setting in vif-nat
>  
>  Setting the hostname is failing because the "$XENBUS_PATH/domain"
>  doesn't exist anymore. To fix this we set it to dom$domid
>  
> -Index: git/tools/hotplug/Linux/vif-nat
> -===================================================================
> ---- git.orig/tools/hotplug/Linux/vif-nat
> -+++ git/tools/hotplug/Linux/vif-nat
> -@@ -86,6 +86,7 @@ router_ip=$(routing_ip "$ip")
> +Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> +Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> +Acked-by: Wei Liu <wl@xen.org>
> +---
> + tools/hotplug/Linux/vif-nat | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat
> +index a76d9c784b..26144350b3 100644
> +--- a/tools/hotplug/Linux/vif-nat
> ++++ b/tools/hotplug/Linux/vif-nat
> +@@ -85,7 +85,7 @@ router_ip=$(routing_ip "$ip")
> + # Split the given IP/bits pair.
>   vif_ip=`echo ${ip} | awk -F/ '{print $1}'`
>   
> - hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----')
> -+[ -z "${hostname}" ] && hostname=dom$domid
> +-hostname=$(xenstore_read "$XENBUS_PATH/domain" | tr -- '_.:/+' '-----')
> ++hostname=dom$domid
>   if [ "$vifid" != "1" ]
>   then
>     hostname="$hostname-$vifid"
> +-- 
> +2.17.1
> -- 
> 2.17.1
> 

> 
> 
> 

Re: [PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status

[Kamil Dziezyk]

[-- Attachment #1: Type: text/plain, Size: 43 bytes --]

Please backport this patch to gatesgarth.

[-- Attachment #2: Type: text/html, Size: 333 bytes --]

Re: [meta-arm] [PATCH] arm-autonomy/xen-tools: update vif hostname fix patch status

[Jon Mason]

On Wed, Dec 09, 2020 at 07:51:00AM -0800, Kamil Dziezyk wrote:
> Please backport this patch to gatesgarth.

Done

> 
> 
>