[PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

Added configure options to enable spice and usbredir to upstream
qemu build done with xen.

Note: I wait feedback and I'll improve it if needed.

Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

---

Changes in v5:
- improved README changes
- changed qemuu_add_par variable to qemuu_extra_args
- fixed some indentation errors
- changed 2 additions that was bash-only
- run autoconf to update configure file

Changes in v4:
- removed upstream qemu debug option already included by default if
  tools debug is enabled.
- refresh for latest xen unstable git
---
 README             |    7 +++++++
 config/Tools.mk.in |    1 +
 tools/Makefile     |    1 +
 tools/configure    |   17 +++++++++++++++++
 tools/configure.ac |    8 ++++++++
 5 files changed, 34 insertions(+)

diff --git a/README b/README
index 9bbe734..f5d3c83 100644
--- a/README
+++ b/README
@@ -72,6 +72,13 @@ disabled at compile time:
     * cmake (if building vtpm stub domains)
     * markdown
     * figlet (for generating the traditional Xen start of day banner)
+    * Development install of spice protocol (e.g. libspice-protocol-dev).
+      Required to build Spice for qemu upstream if enabled with configure.
+    * Development install of spice server (e.g. libspice-server-dev).
+      Required to build Spice for qemu upstream if enabled with configure.
+    * Development install of usb redirection (e.g. libusbredirparser-dev).
+      Required to build usb redirection for qemu upstream if enabled
+      with configure.
 
 Second, you need to acquire a suitable kernel for use in domain 0. If
 possible you should use a kernel provided by your OS distributor. If
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 0bdf37a..efe5bc6 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -54,6 +54,7 @@ CONFIG_SEABIOS      := @seabios@
 CONFIG_QEMU_TRAD    := @qemu_traditional@
 CONFIG_QEMU_XEN     := @qemu_xen@
 CONFIG_BLKTAP1      := @blktap1@
+CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@
 
 #System options
 ZLIB                := @zlib@
diff --git a/tools/Makefile b/tools/Makefile
index c3cfb38..555682b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -203,6 +203,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--disable-docs \
 		--disable-guest-agent \
 		--python=$(PYTHON) \
+		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		$(IOEMU_CONFIGURE_CROSS); \
 	$(MAKE) all
 
diff --git a/tools/configure b/tools/configure
index e1eeff4..354cacf 100755
--- a/tools/configure
+++ b/tools/configure
@@ -687,6 +687,7 @@ ovmf_path
 seabios_path
 qemu_xen
 qemu_traditional
+qemuu_extra_args
 blktap1
 debug
 seabios
@@ -763,6 +764,8 @@ enable_rombios
 enable_seabios
 enable_debug
 enable_blktap1
+enable_qemuu_spice
+enable_qemuu_usbredir
 enable_qemu_traditional
 with_system_qemu
 with_system_seabios
@@ -1423,6 +1426,8 @@ Optional Features:
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
   --disable-debug         Disable debug build of tools (default is ENABLED)
   --enable-blktap1        Enable blktap1 tools (default is DISABLED)
+ --enable-qemuu-spice    Enable Spice build on qemu upstream
+ --enable-qemuu-usbredir Enable usb redirection build on qemu upstream
   --enable-qemu-traditional
                           Enable qemu traditional device model, (DEFAULT is on
                           for x86, otherwise off)
@@ -3741,6 +3746,18 @@ blktap1=$ax_cv_blktap1
 
 
 
+# Check whether --enable-qemuu-spice was given.
+if test "${enable_qemuu_spice+set}" = set; then :
+  enableval=$enable_qemuu_spice; qemuu_extra_args="$qemuu_extra_args --enable-spice"
+fi
+
+# Check whether --enable-qemuu-usbredir was given.
+if test "${enable_qemuu_usbredir+set}" = set; then :
+  enableval=$enable_qemuu_usbredir; qemuu_extra_args="$qemuu_extra_args --enable-usb-redir"
+fi
+
+
+
 # Check whether --enable-qemu-traditional was given.
 if test "${enable_qemu_traditional+set}" = set; then :
   enableval=$enable_qemu_traditional;
diff --git a/tools/configure.ac b/tools/configure.ac
index 00fb47b..b0f8b54 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -59,6 +59,14 @@ AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
 AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
 AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools])
 
+AC_ARG_ENABLE([qemuu-spice],
+    [ --enable-qemuu-spice    Enable Spice build on qemu upstream],
+    [qemuu_extra_args="$qemuu_extra_args --enable-spice"])
+AC_ARG_ENABLE([qemuu-usbredir],
+    [ --enable-qemuu-usbredir Enable usb redirection build on qemu upstream],
+    [qemuu_extra_args="$qemuu_extra_args --enable-usb-redir"])
+AC_SUBST(qemuu_extra_args)
+
 AC_ARG_ENABLE([qemu-traditional],
     AS_HELP_STRING([--enable-qemu-traditional],
                    [Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off)]),,[
-- 
1.7.9.5

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

Il 23/04/2014 17:23, Fabio Fantoni ha scritto:
> Added configure options to enable spice and usbredir to upstream
> qemu build done with xen.
>
> Note: I wait feedback and I'll improve it if needed.
>
> Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

Ping.
Patch is tested and working, I'm waiting feedback.

>
> ---
>
> Changes in v5:
> - improved README changes
> - changed qemuu_add_par variable to qemuu_extra_args
> - fixed some indentation errors
> - changed 2 additions that was bash-only
> - run autoconf to update configure file
>
> Changes in v4:
> - removed upstream qemu debug option already included by default if
>    tools debug is enabled.
> - refresh for latest xen unstable git
> ---
>   README             |    7 +++++++
>   config/Tools.mk.in |    1 +
>   tools/Makefile     |    1 +
>   tools/configure    |   17 +++++++++++++++++
>   tools/configure.ac |    8 ++++++++
>   5 files changed, 34 insertions(+)
>
> diff --git a/README b/README
> index 9bbe734..f5d3c83 100644
> --- a/README
> +++ b/README
> @@ -72,6 +72,13 @@ disabled at compile time:
>       * cmake (if building vtpm stub domains)
>       * markdown
>       * figlet (for generating the traditional Xen start of day banner)
> +    * Development install of spice protocol (e.g. libspice-protocol-dev).
> +      Required to build Spice for qemu upstream if enabled with configure.
> +    * Development install of spice server (e.g. libspice-server-dev).
> +      Required to build Spice for qemu upstream if enabled with configure.
> +    * Development install of usb redirection (e.g. libusbredirparser-dev).
> +      Required to build usb redirection for qemu upstream if enabled
> +      with configure.
>   
>   Second, you need to acquire a suitable kernel for use in domain 0. If
>   possible you should use a kernel provided by your OS distributor. If
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index 0bdf37a..efe5bc6 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -54,6 +54,7 @@ CONFIG_SEABIOS      := @seabios@
>   CONFIG_QEMU_TRAD    := @qemu_traditional@
>   CONFIG_QEMU_XEN     := @qemu_xen@
>   CONFIG_BLKTAP1      := @blktap1@
> +CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@
>   
>   #System options
>   ZLIB                := @zlib@
> diff --git a/tools/Makefile b/tools/Makefile
> index c3cfb38..555682b 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -203,6 +203,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
>   		--disable-docs \
>   		--disable-guest-agent \
>   		--python=$(PYTHON) \
> +		$(CONFIG_QEMUU_EXTRA_ARGS) \
>   		$(IOEMU_CONFIGURE_CROSS); \
>   	$(MAKE) all
>   
> diff --git a/tools/configure b/tools/configure
> index e1eeff4..354cacf 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -687,6 +687,7 @@ ovmf_path
>   seabios_path
>   qemu_xen
>   qemu_traditional
> +qemuu_extra_args
>   blktap1
>   debug
>   seabios
> @@ -763,6 +764,8 @@ enable_rombios
>   enable_seabios
>   enable_debug
>   enable_blktap1
> +enable_qemuu_spice
> +enable_qemuu_usbredir
>   enable_qemu_traditional
>   with_system_qemu
>   with_system_seabios
> @@ -1423,6 +1426,8 @@ Optional Features:
>     --disable-seabios       Disable SeaBIOS (default is ENABLED)
>     --disable-debug         Disable debug build of tools (default is ENABLED)
>     --enable-blktap1        Enable blktap1 tools (default is DISABLED)
> + --enable-qemuu-spice    Enable Spice build on qemu upstream
> + --enable-qemuu-usbredir Enable usb redirection build on qemu upstream
>     --enable-qemu-traditional
>                             Enable qemu traditional device model, (DEFAULT is on
>                             for x86, otherwise off)
> @@ -3741,6 +3746,18 @@ blktap1=$ax_cv_blktap1
>   
>   
>   
> +# Check whether --enable-qemuu-spice was given.
> +if test "${enable_qemuu_spice+set}" = set; then :
> +  enableval=$enable_qemuu_spice; qemuu_extra_args="$qemuu_extra_args --enable-spice"
> +fi
> +
> +# Check whether --enable-qemuu-usbredir was given.
> +if test "${enable_qemuu_usbredir+set}" = set; then :
> +  enableval=$enable_qemuu_usbredir; qemuu_extra_args="$qemuu_extra_args --enable-usb-redir"
> +fi
> +
> +
> +
>   # Check whether --enable-qemu-traditional was given.
>   if test "${enable_qemu_traditional+set}" = set; then :
>     enableval=$enable_qemu_traditional;
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 00fb47b..b0f8b54 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -59,6 +59,14 @@ AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
>   AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
>   AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools])
>   
> +AC_ARG_ENABLE([qemuu-spice],
> +    [ --enable-qemuu-spice    Enable Spice build on qemu upstream],
> +    [qemuu_extra_args="$qemuu_extra_args --enable-spice"])
> +AC_ARG_ENABLE([qemuu-usbredir],
> +    [ --enable-qemuu-usbredir Enable usb redirection build on qemu upstream],
> +    [qemuu_extra_args="$qemuu_extra_args --enable-usb-redir"])
> +AC_SUBST(qemuu_extra_args)
> +
>   AC_ARG_ENABLE([qemu-traditional],
>       AS_HELP_STRING([--enable-qemu-traditional],
>                      [Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off)]),,[

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Ian Campbell]

On Wed, 2014-04-23 at 17:23 +0200, Fabio Fantoni wrote:
> Added configure options to enable spice and usbredir to upstream
> qemu build done with xen.

CCing qemuu maintainers for their feedback on the suitability of doing
this.

> @@ -1423,6 +1426,8 @@ Optional Features:
>    --disable-seabios       Disable SeaBIOS (default is ENABLED)
>    --disable-debug         Disable debug build of tools (default is ENABLED)
>    --enable-blktap1        Enable blktap1 tools (default is DISABLED)
> + --enable-qemuu-spice    Enable Spice build on qemu upstream
> + --enable-qemuu-usbredir Enable usb redirection build on qemu upstream

This indicates that your AC_ARG_ENABLE invocations are missing a leading
space. (it'd be nice if this didn't have to happen manually...)

> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index 0bdf37a..efe5bc6 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -54,6 +54,7 @@ CONFIG_SEABIOS      := @seabios@
>  CONFIG_QEMU_TRAD    := @qemu_traditional@
>  CONFIG_QEMU_XEN     := @qemu_xen@
>  CONFIG_BLKTAP1      := @blktap1@
> +CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@


I don't particularly mind this but the normal way of doing this appears
to be to set something like CONFIG_QEMUU_<FEATURE> to y or n and then
handle it in tools/Makefile, see e.g. the use of QEMU_XEN_ENABLE_DEBUG.

Ian.

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

Il 02/05/2014 12:37, Ian Campbell ha scritto:
> On Wed, 2014-04-23 at 17:23 +0200, Fabio Fantoni wrote:
>> Added configure options to enable spice and usbredir to upstream
>> qemu build done with xen.
> CCing qemuu maintainers for their feedback on the suitability of doing
> this.
>
>> @@ -1423,6 +1426,8 @@ Optional Features:
>>     --disable-seabios       Disable SeaBIOS (default is ENABLED)
>>     --disable-debug         Disable debug build of tools (default is ENABLED)
>>     --enable-blktap1        Enable blktap1 tools (default is DISABLED)
>> + --enable-qemuu-spice    Enable Spice build on qemu upstream
>> + --enable-qemuu-usbredir Enable usb redirection build on qemu upstream
> This indicates that your AC_ARG_ENABLE invocations are missing a leading
> space. (it'd be nice if this didn't have to happen manually...)
>
>> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
>> index 0bdf37a..efe5bc6 100644
>> --- a/config/Tools.mk.in
>> +++ b/config/Tools.mk.in
>> @@ -54,6 +54,7 @@ CONFIG_SEABIOS      := @seabios@
>>   CONFIG_QEMU_TRAD    := @qemu_traditional@
>>   CONFIG_QEMU_XEN     := @qemu_xen@
>>   CONFIG_BLKTAP1      := @blktap1@
>> +CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@
>
> I don't particularly mind this but the normal way of doing this appears
> to be to set something like CONFIG_QEMUU_<FEATURE> to y or n and then
> handle it in tools/Makefile, see e.g. the use of QEMU_XEN_ENABLE_DEBUG.
>
> Ian.
>
Ian Jackson told me to do only one that contain all extra qemu options:
http://lists.xen.org/archives/html/xen-devel/2012-04/msg00238.html
So?

Thanks for any reply.

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Ian Campbell]

On Fri, 2014-05-02 at 15:19 +0200, Fabio Fantoni wrote:
> Il 02/05/2014 12:37, Ian Campbell ha scritto:
> > On Wed, 2014-04-23 at 17:23 +0200, Fabio Fantoni wrote:
> >> Added configure options to enable spice and usbredir to upstream
> >> qemu build done with xen.
> > CCing qemuu maintainers for their feedback on the suitability of doing
> > this.
> >
> >> @@ -1423,6 +1426,8 @@ Optional Features:
> >>     --disable-seabios       Disable SeaBIOS (default is ENABLED)
> >>     --disable-debug         Disable debug build of tools (default is ENABLED)
> >>     --enable-blktap1        Enable blktap1 tools (default is DISABLED)
> >> + --enable-qemuu-spice    Enable Spice build on qemu upstream
> >> + --enable-qemuu-usbredir Enable usb redirection build on qemu upstream
> > This indicates that your AC_ARG_ENABLE invocations are missing a leading
> > space. (it'd be nice if this didn't have to happen manually...)
> >
> >> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> >> index 0bdf37a..efe5bc6 100644
> >> --- a/config/Tools.mk.in
> >> +++ b/config/Tools.mk.in
> >> @@ -54,6 +54,7 @@ CONFIG_SEABIOS      := @seabios@
> >>   CONFIG_QEMU_TRAD    := @qemu_traditional@
> >>   CONFIG_QEMU_XEN     := @qemu_xen@
> >>   CONFIG_BLKTAP1      := @blktap1@
> >> +CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@
> >
> > I don't particularly mind this but the normal way of doing this appears
> > to be to set something like CONFIG_QEMUU_<FEATURE> to y or n and then
> > handle it in tools/Makefile, see e.g. the use of QEMU_XEN_ENABLE_DEBUG.
> >
> > Ian.
> >
> Ian Jackson told me to do only one that contain all extra qemu options:
> http://lists.xen.org/archives/html/xen-devel/2012-04/msg00238.html
> So?

I'm not sure Ian was suggesting what you have implemented. For starters
he said "One AC_ARG_ENABLE" but here you have added 3.

Ian?

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream"):
> On Fri, 2014-05-02 at 15:19 +0200, Fabio Fantoni wrote:
> > Ian Jackson told me to do only one that contain all extra qemu options:
> > http://lists.xen.org/archives/html/xen-devel/2012-04/msg00238.html
> > So?
> 
> I'm not sure Ian was suggesting what you have implemented. For starters
> he said "One AC_ARG_ENABLE" but here you have added 3.

Yes, I meant there should be one argument to the Xen configure script
that specifies all the extra options to qemu.  That way when a new
qemu option appears, it's transparently available.

Thanks,
Ian.

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

[-- Attachment #1.1: Type: text/plain, Size: 1062 bytes --]

2014-05-02 18:59 GMT+02:00 Ian Jackson <Ian.Jackson@eu.citrix.com>:

> Ian Campbell writes ("Re: [PATCH v5] Autoconf: add options to enable spice
> and usbredir in qemu upstream"):
> > On Fri, 2014-05-02 at 15:19 +0200, Fabio Fantoni wrote:
> > > Ian Jackson told me to do only one that contain all extra qemu options:
> > > http://lists.xen.org/archives/html/xen-devel/2012-04/msg00238.html
> > > So?
> >
> > I'm not sure Ian was suggesting what you have implemented. For starters
> > he said "One AC_ARG_ENABLE" but here you have added 3.
>
> Yes, I meant there should be one argument to the Xen configure script
> that specifies all the extra options to qemu.  That way when a new
> qemu option appears, it's transparently available.
>
> Thanks,
> Ian.
>

You mean to have only one xen configure (and boolean) option that enabled
all additional optionals qemu features?
If yes I not think is good, if some users want enable only 1 or more of
them but not all couldn't.
If not can you explain better please?

Thanks for any reply and sorry for my bad english.

[-- Attachment #1.2: Type: text/html, Size: 1978 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Ian Jackson]

Fabio Fantoni writes ("Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream"):
>     Yes, I meant there should be one argument to the Xen configure script
>     that specifies all the extra options to qemu.  That way when a new
>     qemu option appears, it's transparently available.
...
> You mean to have only one xen configure (and boolean) option that enabled all
> additional optionals qemu features?
> If yes I not think is good, if some users want enable only 1 or more of them
> but not all couldn't.
> If not can you explain better please?

No, not one boolean option.  Either one option that takes a string
argument, or one option that can be used multiple times to provide
successive arguments to qemu's configure.

The idea is that we won't have to update this again when the next qemu
configure option comes up (or when someone wants to supply an option
to qemu's configure that we hadn't anticipated they would want to
adjust).

Ian.

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

[-- Attachment #1.1: Type: text/plain, Size: 1293 bytes --]

2014-05-02 20:05 GMT+02:00 Ian Jackson <Ian.Jackson@eu.citrix.com>:

> Fabio Fantoni writes ("Re: [PATCH v5] Autoconf: add options to enable
> spice and usbredir in qemu upstream"):
> >     Yes, I meant there should be one argument to the Xen configure script
> >     that specifies all the extra options to qemu.  That way when a new
> >     qemu option appears, it's transparently available.
> ...
> > You mean to have only one xen configure (and boolean) option that
> enabled all
> > additional optionals qemu features?
> > If yes I not think is good, if some users want enable only 1 or more of
> them
> > but not all couldn't.
> > If not can you explain better please?
>
> No, not one boolean option.  Either one option that takes a string
> argument, or one option that can be used multiple times to provide
> successive arguments to qemu's configure.
>
> The idea is that we won't have to update this again when the next qemu
> configure option comes up (or when someone wants to supply an option
> to qemu's configure that we hadn't anticipated they would want to
> adjust).
>
> Ian.
>

Now I understand, great idea.
Seems what I did on first version of this patch:
http://lists.xen.org/archives/html/xen-devel/2012-03/msg02171.html
But I not remember or found because was changed :(

[-- Attachment #1.2: Type: text/html, Size: 2079 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Stefano Stabellini]

On Fri, 2 May 2014, Ian Campbell wrote:
> On Wed, 2014-04-23 at 17:23 +0200, Fabio Fantoni wrote:
> > Added configure options to enable spice and usbredir to upstream
> > qemu build done with xen.
> 
> CCing qemuu maintainers for their feedback on the suitability of doing
> this.

>From QEMU POV is OK.

Re: [PATCH v5] Autoconf: add options to enable spice and usbredir in qemu upstream

[Fabio Fantoni]

Il 06/05/2014 14:58, Stefano Stabellini ha scritto:
> On Fri, 2 May 2014, Ian Campbell wrote:
>> On Wed, 2014-04-23 at 17:23 +0200, Fabio Fantoni wrote:
>>> Added configure options to enable spice and usbredir to upstream
>>> qemu build done with xen.
>> CCing qemuu maintainers for their feedback on the suitability of doing
>> this.
>  From QEMU POV is OK.
Thanks for your reply.
Following Ian Jackson advice I'm trying to redo the patch similar to v1 
for have only one variable to add all arbitrary qemuu build options 
instead multiple statics.