* [PATCH 0/2] tools: misc fixes
@ 2016-09-26 16:44 Roger Pau Monne
2016-09-26 16:44 ` [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c Roger Pau Monne
2016-09-26 16:44 ` [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios} Roger Pau Monne
0 siblings, 2 replies; 6+ messages in thread
From: Roger Pau Monne @ 2016-09-26 16:44 UTC (permalink / raw)
To: xen-devel
Two fixes for the tools, one is a typo fix and the other one is a fix for
configure.
Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c
2016-09-26 16:44 [PATCH 0/2] tools: misc fixes Roger Pau Monne
@ 2016-09-26 16:44 ` Roger Pau Monne
2016-09-26 16:49 ` Wei Liu
2016-09-26 16:44 ` [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios} Roger Pau Monne
1 sibling, 1 reply; 6+ messages in thread
From: Roger Pau Monne @ 2016-09-26 16:44 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Roger Pau Monne
Fix the definition of the xengnttab_grant_copy function so it's inline with
the prototypes in xengnttab.h.
This unbreaks the tools build on systems that don't have a gnttab device.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/libs/gnttab/gnttab_unimp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/libs/gnttab/gnttab_unimp.c b/tools/libs/gnttab/gnttab_unimp.c
index 829eced..26e4ee1 100644
--- a/tools/libs/gnttab/gnttab_unimp.c
+++ b/tools/libs/gnttab/gnttab_unimp.c
@@ -78,9 +78,9 @@ int xengnttab_unmap(xengnttab_handle *xgt, void *start_address, uint32_t count)
abort();
}
-int xengnttab_copy_grant(xengnttab_handle *xgt,
+int xengnttab_grant_copy(xengnttab_handle *xgt,
uint32_t count,
- xengnttab_copy_grant_segment_t *segs)
+ xengnttab_grant_copy_segment_t *segs)
{
abort();
}
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios}
2016-09-26 16:44 [PATCH 0/2] tools: misc fixes Roger Pau Monne
2016-09-26 16:44 ` [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c Roger Pau Monne
@ 2016-09-26 16:44 ` Roger Pau Monne
2016-09-26 16:57 ` Wei Liu
1 sibling, 1 reply; 6+ messages in thread
From: Roger Pau Monne @ 2016-09-26 16:44 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Wei Liu, Roger Pau Monne
Current configure code doesn't define {SEABIOS/OVMF}_PATH when
--with-system-{ovmf/seabios} is used. Fix this by making sure those defines
are always set if the internal {ovmf/seabios}_path variables are also set.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
Please re-run autogen.sh before committing.
---
tools/configure.ac | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tools/configure.ac b/tools/configure.ac
index f010d72..6788ea2 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -222,10 +222,9 @@ AC_ARG_WITH([system-seabios],
*) seabios_path=$withval ;;
esac
],[])
-AS_IF([test "x$seabios" = "xy"], [
- AC_DEFINE_UNQUOTED([SEABIOS_PATH],
- ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
- [SeaBIOS path])
+AS_IF([test "x$seabios" = "xy"], [seabios_path=$XENFIRMWAREDIR/seabios.bin])
+AS_IF([test -n "$seabios_path"], [
+ AC_DEFINE_UNQUOTED([SEABIOS_PATH],["$seabios_path"],[SeaBIOS path])
])
AC_ARG_WITH([system-ovmf],
@@ -239,10 +238,9 @@ AC_ARG_WITH([system-ovmf],
*) ovmf_path=$withval ;;
esac
],[])
-AS_IF([test "x$ovmf" = "xy"], [
- AC_DEFINE_UNQUOTED([OVMF_PATH],
- ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
- [OVMF path])
+AS_IF([test "x$ovmf" = "xy"], [ovmf_path=$XENFIRMWAREDIR/ovmf.bin])
+AS_IF([test -n "$ovmf_path"], [
+ AC_DEFINE_UNQUOTED([OVMF_PATH],["$ovmf_path"],[OVMF path])
])
AC_ARG_WITH([extra-qemuu-configure-args],
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c
2016-09-26 16:44 ` [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c Roger Pau Monne
@ 2016-09-26 16:49 ` Wei Liu
0 siblings, 0 replies; 6+ messages in thread
From: Wei Liu @ 2016-09-26 16:49 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
I will change lib to libs in subject line while committing
On Mon, Sep 26, 2016 at 06:44:08PM +0200, Roger Pau Monne wrote:
> Fix the definition of the xengnttab_grant_copy function so it's inline with
in line with
> the prototypes in xengnttab.h.
>
> This unbreaks the tools build on systems that don't have a gnttab device.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/libs/gnttab/gnttab_unimp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/libs/gnttab/gnttab_unimp.c b/tools/libs/gnttab/gnttab_unimp.c
> index 829eced..26e4ee1 100644
> --- a/tools/libs/gnttab/gnttab_unimp.c
> +++ b/tools/libs/gnttab/gnttab_unimp.c
> @@ -78,9 +78,9 @@ int xengnttab_unmap(xengnttab_handle *xgt, void *start_address, uint32_t count)
> abort();
> }
>
> -int xengnttab_copy_grant(xengnttab_handle *xgt,
> +int xengnttab_grant_copy(xengnttab_handle *xgt,
> uint32_t count,
> - xengnttab_copy_grant_segment_t *segs)
> + xengnttab_grant_copy_segment_t *segs)
> {
> abort();
> }
> --
> 2.7.4 (Apple Git-66)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios}
2016-09-26 16:44 ` [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios} Roger Pau Monne
@ 2016-09-26 16:57 ` Wei Liu
2016-09-26 17:15 ` Roger Pau Monne
0 siblings, 1 reply; 6+ messages in thread
From: Wei Liu @ 2016-09-26 16:57 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Wei Liu, Ian Jackson
On Mon, Sep 26, 2016 at 06:44:09PM +0200, Roger Pau Monne wrote:
> Current configure code doesn't define {SEABIOS/OVMF}_PATH when
> --with-system-{ovmf/seabios} is used. Fix this by making sure those defines
> are always set if the internal {ovmf/seabios}_path variables are also set.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
> Please re-run autogen.sh before committing.
> ---
> tools/configure.ac | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/tools/configure.ac b/tools/configure.ac
> index f010d72..6788ea2 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -222,10 +222,9 @@ AC_ARG_WITH([system-seabios],
> *) seabios_path=$withval ;;
> esac
> ],[])
> -AS_IF([test "x$seabios" = "xy"], [
> - AC_DEFINE_UNQUOTED([SEABIOS_PATH],
> - ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
> - [SeaBIOS path])
> +AS_IF([test "x$seabios" = "xy"], [seabios_path=$XENFIRMWAREDIR/seabios.bin])
> +AS_IF([test -n "$seabios_path"], [
> + AC_DEFINE_UNQUOTED([SEABIOS_PATH],["$seabios_path"],[SeaBIOS path])
> ])
What about just change the test condition in the original code to
test "x$seabios" = "xy" || -n "$seabios_path"
?
That should result in the same thing, right?
>
> AC_ARG_WITH([system-ovmf],
> @@ -239,10 +238,9 @@ AC_ARG_WITH([system-ovmf],
> *) ovmf_path=$withval ;;
> esac
> ],[])
> -AS_IF([test "x$ovmf" = "xy"], [
> - AC_DEFINE_UNQUOTED([OVMF_PATH],
> - ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
> - [OVMF path])
> +AS_IF([test "x$ovmf" = "xy"], [ovmf_path=$XENFIRMWAREDIR/ovmf.bin])
> +AS_IF([test -n "$ovmf_path"], [
> + AC_DEFINE_UNQUOTED([OVMF_PATH],["$ovmf_path"],[OVMF path])
> ])
>
> AC_ARG_WITH([extra-qemuu-configure-args],
> --
> 2.7.4 (Apple Git-66)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios}
2016-09-26 16:57 ` Wei Liu
@ 2016-09-26 17:15 ` Roger Pau Monne
0 siblings, 0 replies; 6+ messages in thread
From: Roger Pau Monne @ 2016-09-26 17:15 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, Ian Jackson
On Mon, Sep 26, 2016 at 05:57:00PM +0100, Wei Liu wrote:
> On Mon, Sep 26, 2016 at 06:44:09PM +0200, Roger Pau Monne wrote:
> > Current configure code doesn't define {SEABIOS/OVMF}_PATH when
> > --with-system-{ovmf/seabios} is used. Fix this by making sure those defines
> > are always set if the internal {ovmf/seabios}_path variables are also set.
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > ---
> > Please re-run autogen.sh before committing.
> > ---
> > tools/configure.ac | 14 ++++++--------
> > 1 file changed, 6 insertions(+), 8 deletions(-)
> >
> > diff --git a/tools/configure.ac b/tools/configure.ac
> > index f010d72..6788ea2 100644
> > --- a/tools/configure.ac
> > +++ b/tools/configure.ac
> > @@ -222,10 +222,9 @@ AC_ARG_WITH([system-seabios],
> > *) seabios_path=$withval ;;
> > esac
> > ],[])
> > -AS_IF([test "x$seabios" = "xy"], [
> > - AC_DEFINE_UNQUOTED([SEABIOS_PATH],
> > - ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
> > - [SeaBIOS path])
> > +AS_IF([test "x$seabios" = "xy"], [seabios_path=$XENFIRMWAREDIR/seabios.bin])
> > +AS_IF([test -n "$seabios_path"], [
> > + AC_DEFINE_UNQUOTED([SEABIOS_PATH],["$seabios_path"],[SeaBIOS path])
> > ])
>
> What about just change the test condition in the original code to
>
> test "x$seabios" = "xy" || -n "$seabios_path"
>
> ?
>
> That should result in the same thing, right?
Yes, that's right. Should I do it, or are you going to send it? TBH, it's
just a one line change, and the idea is yours.
Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-26 17:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-26 16:44 [PATCH 0/2] tools: misc fixes Roger Pau Monne
2016-09-26 16:44 ` [PATCH 1/2] lib/gnttab: fix build of gnttab_unimp.c Roger Pau Monne
2016-09-26 16:49 ` Wei Liu
2016-09-26 16:44 ` [PATCH 2/2] tools/configure: fix --with-system-{ovmf/seabios} Roger Pau Monne
2016-09-26 16:57 ` Wei Liu
2016-09-26 17:15 ` Roger Pau Monne
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).