1. Patchew
  2. Xen
  3. View series

[Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5

Olaf Hering posted 1 patch 6 years, 7 months ago
Failed in applying to current master (apply log)
docs/man/xl.1.pod.in      | 2 +-
docs/man/xl.conf.5.pod.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Olaf Hering 6 years, 7 months ago 
xl(1) opens xl.conf in XEN_CONFIG_DIR.
Substitute this variable also in the man page.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 docs/man/xl.1.pod.in      | 2 +-
 docs/man/xl.conf.5.pod.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index 3d64eaa5b2..fb17153635 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -50,7 +50,7 @@ setup the bridge.
 
 If you specify the amount of memory dom0 has, passing B<dom0_mem> to
 Xen, it is highly recommended to disable B<autoballoon>. Edit
-B</etc/xen/xl.conf> and set it to 0.
+B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0.
 
 =item run xl as B<root>
 
diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.in
index 2beb2119a8..b16036aaeb 100644
--- a/docs/man/xl.conf.5.pod.in
+++ b/docs/man/xl.conf.5.pod.in
@@ -1,6 +1,6 @@
 =head1 NAME
 
-/etc/xen/xl.conf - XL Global/Host Configuration 
+@XEN_CONFIG_DIR@/xl.conf - XL Global/Host Configuration 
 
 =head1 DESCRIPTION
 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Wei Liu 6 years, 5 months ago 
On Fri, Jun 21, 2019 at 11:30:05AM +0200, Olaf Hering wrote:
> xl(1) opens xl.conf in XEN_CONFIG_DIR.
> Substitute this variable also in the man page.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  docs/man/xl.1.pod.in      | 2 +-
>  docs/man/xl.conf.5.pod.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
> index 3d64eaa5b2..fb17153635 100644
> --- a/docs/man/xl.1.pod.in
> +++ b/docs/man/xl.1.pod.in
> @@ -50,7 +50,7 @@ setup the bridge.
>  
>  If you specify the amount of memory dom0 has, passing B<dom0_mem> to
>  Xen, it is highly recommended to disable B<autoballoon>. Edit
> -B</etc/xen/xl.conf> and set it to 0.
> +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0.
>  
>  =item run xl as B<root>
>  
> diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.in
> index 2beb2119a8..b16036aaeb 100644
> --- a/docs/man/xl.conf.5.pod.in
> +++ b/docs/man/xl.conf.5.pod.in

Sorry for the late reply.

This doesn't apply. There is no such file.

Wei.

> @@ -1,6 +1,6 @@
>  =head1 NAME
>  
> -/etc/xen/xl.conf - XL Global/Host Configuration 
> +@XEN_CONFIG_DIR@/xl.conf - XL Global/Host Configuration 
>  
>  =head1 DESCRIPTION
>  

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Olaf Hering 6 years, 5 months ago 
Am Sun, 18 Aug 2019 18:20:26 +0100
schrieb Wei Liu <wl@xen.org>:

> This doesn't apply. There is no such file.

My changes need to be applied in this order, some of them may apply in any order:

20190619120633.27466-1-olaf@aepfle.de
20190619121715.28532-1-olaf@aepfle.de
20190619123818.30747-1-olaf@aepfle.de
20190619130335.3458-1-olaf@aepfle.de
20190621092944.29241-1-olaf@aepfle.de
20190621093005.29329-1-olaf@aepfle.de


Olaf
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Wei Liu 6 years, 5 months ago 
On Mon, Aug 19, 2019 at 09:57:17AM +0200, Olaf Hering wrote:
> Am Sun, 18 Aug 2019 18:20:26 +0100
> schrieb Wei Liu <wl@xen.org>:
> 
> > This doesn't apply. There is no such file.
> 
> My changes need to be applied in this order, some of them may apply in any order:
> 
> 20190619120633.27466-1-olaf@aepfle.de
> 20190619121715.28532-1-olaf@aepfle.de
> 20190619123818.30747-1-olaf@aepfle.de
> 20190619130335.3458-1-olaf@aepfle.de
> 20190621092944.29241-1-olaf@aepfle.de
> 20190621093005.29329-1-olaf@aepfle.de

Thanks. I will take a look.

Wei.

> 
> 
> Olaf



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Andrew Cooper 6 years, 5 months ago 
On 18/08/2019 18:20, Wei Liu wrote:
> On Fri, Jun 21, 2019 at 11:30:05AM +0200, Olaf Hering wrote:
>> xl(1) opens xl.conf in XEN_CONFIG_DIR.
>> Substitute this variable also in the man page.
>>
>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>> ---
>>  docs/man/xl.1.pod.in      | 2 +-
>>  docs/man/xl.conf.5.pod.in | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
>> index 3d64eaa5b2..fb17153635 100644
>> --- a/docs/man/xl.1.pod.in
>> +++ b/docs/man/xl.1.pod.in
>> @@ -50,7 +50,7 @@ setup the bridge.
>>  
>>  If you specify the amount of memory dom0 has, passing B<dom0_mem> to
>>  Xen, it is highly recommended to disable B<autoballoon>. Edit
>> -B</etc/xen/xl.conf> and set it to 0.
>> +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0.
>>  
>>  =item run xl as B<root>
>>  
>> diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.in
>> index 2beb2119a8..b16036aaeb 100644
>> --- a/docs/man/xl.conf.5.pod.in
>> +++ b/docs/man/xl.conf.5.pod.in
> Sorry for the late reply.
>
> This doesn't apply. There is no such file.

Hmm.  We have a xl.conf.5.pod which has no substitutions in, and I don't
recall this changing.  Perhaps a logical dependency earlier in the SUSE
patch queue?

I think this patch needs a {pod=>pod.in} rename as well, for it to apply
to staging and work as intended.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Wei Liu 6 years, 5 months ago 
On Sun, Aug 18, 2019 at 06:27:26PM +0100, Andrew Cooper wrote:
> On 18/08/2019 18:20, Wei Liu wrote:
> > On Fri, Jun 21, 2019 at 11:30:05AM +0200, Olaf Hering wrote:
> >> xl(1) opens xl.conf in XEN_CONFIG_DIR.
> >> Substitute this variable also in the man page.
> >>
> >> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> >> ---
> >>  docs/man/xl.1.pod.in      | 2 +-
> >>  docs/man/xl.conf.5.pod.in | 2 +-
> >>  2 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
> >> index 3d64eaa5b2..fb17153635 100644
> >> --- a/docs/man/xl.1.pod.in
> >> +++ b/docs/man/xl.1.pod.in
> >> @@ -50,7 +50,7 @@ setup the bridge.
> >>  
> >>  If you specify the amount of memory dom0 has, passing B<dom0_mem> to
> >>  Xen, it is highly recommended to disable B<autoballoon>. Edit
> >> -B</etc/xen/xl.conf> and set it to 0.
> >> +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0.
> >>  
> >>  =item run xl as B<root>
> >>  
> >> diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.in
> >> index 2beb2119a8..b16036aaeb 100644
> >> --- a/docs/man/xl.conf.5.pod.in
> >> +++ b/docs/man/xl.conf.5.pod.in
> > Sorry for the late reply.
> >
> > This doesn't apply. There is no such file.
> 
> Hmm.  We have a xl.conf.5.pod which has no substitutions in, and I don't
> recall this changing.  Perhaps a logical dependency earlier in the SUSE
> patch queue?
> 
> I think this patch needs a {pod=>pod.in} rename as well, for it to apply
> to staging and work as intended.

I figured that as well.

Perhaps I missed the patch that did the renaming from Olaf.
Unfortunately I don't have the full xen-devel archive in my mailbox now.

Wei.

> 
> ~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v1] docs: substitute XEN_CONFIG_DIR in xl.conf.5
Posted by Anthony PERARD 6 years, 7 months ago 
On Fri, Jun 21, 2019 at 11:30:05AM +0200, Olaf Hering wrote:
> xl(1) opens xl.conf in XEN_CONFIG_DIR.
> Substitute this variable also in the man page.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  docs/man/xl.1.pod.in      | 2 +-
>  docs/man/xl.conf.5.pod.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
> index 3d64eaa5b2..fb17153635 100644
> --- a/docs/man/xl.1.pod.in
> +++ b/docs/man/xl.1.pod.in
> @@ -50,7 +50,7 @@ setup the bridge.
>  
>  If you specify the amount of memory dom0 has, passing B<dom0_mem> to
>  Xen, it is highly recommended to disable B<autoballoon>. Edit
> -B</etc/xen/xl.conf> and set it to 0.
> +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0.
>  
>  =item run xl as B<root>
>  
> diff --git a/docs/man/xl.conf.5.pod.in b/docs/man/xl.conf.5.pod.in
> index 2beb2119a8..b16036aaeb 100644
> --- a/docs/man/xl.conf.5.pod.in
> +++ b/docs/man/xl.conf.5.pod.in
> @@ -1,6 +1,6 @@
>  =head1 NAME
>  
> -/etc/xen/xl.conf - XL Global/Host Configuration 
> +@XEN_CONFIG_DIR@/xl.conf - XL Global/Host Configuration 

There's a trailing whitespace, it would be worth removing it. git
complain about it.

The patch seems to depends on "Use XEN_SCRIPT_DIR to refer to
/etc/xen/scripts", but the email doesn't mention it. It would have been
useful to add a note bellow the '---' line or send in a series of patch.

Beside that:
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.