[PATCH] Add optionals build configs for qemu upstream

[PATCH] Add optionals build configs for qemu upstream

[Fabio Fantoni]

[-- Attachment #1.1.1: Type: text/plain, Size: 2122 bytes --]

Add optionals build configs for qemu upstream:
CONFIG_QEMUU_DEBUG for enable debug, disabled by default
CONFIG_QEMUU_SPICE for enable spice, disabled by default for now
Add to README requirements for spice enabled

Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>

diff --git a/Config.mk b/Config.mk
index bc6be65..918aa7b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -203,6 +203,8 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
  CONFIG_OVMF ?= n
  CONFIG_ROMBIOS ?= y
  CONFIG_SEABIOS ?= y
+CONFIG_QEMUU_DEBUG ?= n
+CONFIG_QEMUU_SPICE ?= n

  # Specify which qemu-dm to use. This may be `ioemu' to use the old
  # Mercurial in-tree version, or a local directory, or a git URL.diff 
--git a/README b/README
index b15a59b..fdb5e3a 100644
--- a/README
+++ b/README
@@ -60,6 +60,8 @@ provided by your OS distributor:
      * 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & 
bcc debs)
      * ACPI ASL compiler (iasl)
      * markdown
+    * if CONFIG_QEMUU_SPICE=y Dev of spice protocol (e.g. 
libspice-protocol-dev)
+      Dev of spice server (e.g. libspice-server-dev >=0.10)

  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. 
Ifdiff --git a/tools/Makefile b/tools/Makefile
index 6430bfb..eceecb2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -87,6 +87,14 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
               --interp-prefix=$(CROSS_SYS_ROOT)
  endif

+ifeq ($(CONFIG_QEMUU_DEBUG),y)
+QEMU_OPTIONAL_CONFIGS += --enable-debug
+endif
+
+ifeq ($(CONFIG_QEMUU_SPICE),y)
+QEMU_OPTIONAL_CONFIGS += --enable-spice
+endif
+
  QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo 
"$(CONFIG_QEMU)"; else echo .; fi)
  ifneq ($(QEMU_ROOT),.)
  export QEMU_ROOT
@@ -158,6 +166,7 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: 
qemu-xen-dir-find
          --disable-kvm \
          --python=$(PYTHON) \
          $(IOEMU_CONFIGURE_CROSS); \
+        $(QEMU_OPTIONAL_CONFIGS); \
      $(MAKE) install

  subdir-clean-qemu-xen-dir:

[-- Attachment #1.1.2: add_qemu_optionals_build_config.patch --]
[-- Type: text/plain, Size: 1999 bytes --]

Add optionals build configs for qemu upstream:
CONFIG_QEMUU_DEBUG for enable debug, disabled by default
CONFIG_QEMUU_SPICE for enable spice, disabled by default for now
Add to README requirements for spice enabled

Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>

diff --git a/Config.mk b/Config.mk
index bc6be65..918aa7b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -203,6 +203,8 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
 CONFIG_OVMF ?= n
 CONFIG_ROMBIOS ?= y
 CONFIG_SEABIOS ?= y
+CONFIG_QEMUU_DEBUG ?= n
+CONFIG_QEMUU_SPICE ?= n
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.diff --git a/README b/README
index b15a59b..fdb5e3a 100644
--- a/README
+++ b/README
@@ -60,6 +60,8 @@ provided by your OS distributor:
     * 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & bcc debs)
     * ACPI ASL compiler (iasl)
     * markdown
+    * if CONFIG_QEMUU_SPICE=y Dev of spice protocol (e.g. libspice-protocol-dev)
+      Dev of spice server (e.g. libspice-server-dev >=0.10)
 
 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. Ifdiff --git a/tools/Makefile b/tools/Makefile
index 6430bfb..eceecb2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -87,6 +87,14 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
 			 --interp-prefix=$(CROSS_SYS_ROOT)
 endif
 
+ifeq ($(CONFIG_QEMUU_DEBUG),y)
+QEMU_OPTIONAL_CONFIGS += --enable-debug
+endif
+
+ifeq ($(CONFIG_QEMUU_SPICE),y)
+QEMU_OPTIONAL_CONFIGS += --enable-spice
+endif
+
 QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
 ifneq ($(QEMU_ROOT),.)
 export QEMU_ROOT
@@ -158,6 +166,7 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
 		--disable-kvm \
 		--python=$(PYTHON) \
 		$(IOEMU_CONFIGURE_CROSS); \
+		$(QEMU_OPTIONAL_CONFIGS); \
 	$(MAKE) install
 
 subdir-clean-qemu-xen-dir:

[-- Attachment #1.2: Firma crittografica S/MIME --]
[-- Type: application/pkcs7-signature, Size: 4803 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] Add optionals build configs for qemu upstream

[Ian Campbell]

On Tue, 2012-02-28 at 14:28 +0000, Fabio Fantoni wrote:
> Add optionals build configs for qemu upstream:
> CONFIG_QEMUU_DEBUG for enable debug, disabled by default
> CONFIG_QEMUU_SPICE for enable spice, disabled by default for now
> Add to README requirements for spice enabled

I think only the latter is required, isn't it?

If a user's environment meets the requirements then they will get spice,
otherwise they will not.

Also your patch appears to have been w/s mangled.

> 
> Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>
> 
> diff --git a/Config.mk b/Config.mk
> index bc6be65..918aa7b 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -203,6 +203,8 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
>   CONFIG_OVMF ?= n
>   CONFIG_ROMBIOS ?= y
>   CONFIG_SEABIOS ?= y
> +CONFIG_QEMUU_DEBUG ?= n
> +CONFIG_QEMUU_SPICE ?= n
> 
>   # Specify which qemu-dm to use. This may be `ioemu' to use the old
>   # Mercurial in-tree version, or a local directory, or a git URL.diff 
> --git a/README b/README
> index b15a59b..fdb5e3a 100644
> --- a/README
> +++ b/README
> @@ -60,6 +60,8 @@ provided by your OS distributor:
>       * 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & 
> bcc debs)
>       * ACPI ASL compiler (iasl)
>       * markdown
> +    * if CONFIG_QEMUU_SPICE=y Dev of spice protocol (e.g. 
> libspice-protocol-dev)
> +      Dev of spice server (e.g. libspice-server-dev >=0.10)
> 
>   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. 
> Ifdiff --git a/tools/Makefile b/tools/Makefile
> index 6430bfb..eceecb2 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -87,6 +87,14 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
>                --interp-prefix=$(CROSS_SYS_ROOT)
>   endif
> 
> +ifeq ($(CONFIG_QEMUU_DEBUG),y)
> +QEMU_OPTIONAL_CONFIGS += --enable-debug
> +endif
> +
> +ifeq ($(CONFIG_QEMUU_SPICE),y)
> +QEMU_OPTIONAL_CONFIGS += --enable-spice
> +endif
> +
>   QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo 
> "$(CONFIG_QEMU)"; else echo .; fi)
>   ifneq ($(QEMU_ROOT),.)
>   export QEMU_ROOT
> @@ -158,6 +166,7 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: 
> qemu-xen-dir-find
>           --disable-kvm \
>           --python=$(PYTHON) \
>           $(IOEMU_CONFIGURE_CROSS); \
> +        $(QEMU_OPTIONAL_CONFIGS); \
>       $(MAKE) install
> 
>   subdir-clean-qemu-xen-dir:

Re: [PATCH] Add optionals build configs for qemu upstream

[Roger Pau Monné]

2012/2/28 Fabio Fantoni <fantonifabio@tiscali.it>:
> Add optionals build configs for qemu upstream:
> CONFIG_QEMUU_DEBUG for enable debug, disabled by default
> CONFIG_QEMUU_SPICE for enable spice, disabled by default for now
> Add to README requirements for spice enabled
>
> Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it>
>
> diff --git a/Config.mk b/Config.mk
> index bc6be65..918aa7b 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -203,6 +203,8 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
>  CONFIG_OVMF ?= n
>  CONFIG_ROMBIOS ?= y
>  CONFIG_SEABIOS ?= y
> +CONFIG_QEMUU_DEBUG ?= n
> +CONFIG_QEMUU_SPICE ?= n

It will be nice to add this as configure options, so a user can pass
"--enable-qemu-debug" or "--enable-qemu-spice" to configure and the
proper flags are set on the generated config/Tools.mk instead of
setting them directly on .config or Config.mk. There are some examples
of this on tools/configure.ac.

>
>  # Specify which qemu-dm to use. This may be `ioemu' to use the old
>  # Mercurial in-tree version, or a local directory, or a git URL.diff --git
> a/README b/README
> index b15a59b..fdb5e3a 100644
> --- a/README
> +++ b/README
> @@ -60,6 +60,8 @@ provided by your OS distributor:
>     * 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & bcc
> debs)
>     * ACPI ASL compiler (iasl)
>     * markdown
> +    * if CONFIG_QEMUU_SPICE=y Dev of spice protocol (e.g.
> libspice-protocol-dev)
> +      Dev of spice server (e.g. libspice-server-dev >=0.10)
>
>  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. Ifdiff
> --git a/tools/Makefile b/tools/Makefile
> index 6430bfb..eceecb2 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -87,6 +87,14 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
>              --interp-prefix=$(CROSS_SYS_ROOT)
>  endif
>
> +ifeq ($(CONFIG_QEMUU_DEBUG),y)
> +QEMU_OPTIONAL_CONFIGS += --enable-debug
> +endif
> +
> +ifeq ($(CONFIG_QEMUU_SPICE),y)
> +QEMU_OPTIONAL_CONFIGS += --enable-spice
> +endif
> +
>  QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo
> "$(CONFIG_QEMU)"; else echo .; fi)
>  ifneq ($(QEMU_ROOT),.)
>  export QEMU_ROOT
> @@ -158,6 +166,7 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir:
> qemu-xen-dir-find
>         --disable-kvm \
>         --python=$(PYTHON) \
>         $(IOEMU_CONFIGURE_CROSS); \
> +        $(QEMU_OPTIONAL_CONFIGS); \
>     $(MAKE) install
>
>  subdir-clean-qemu-xen-dir:
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>

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

Re: [PATCH] Add optionals build configs for qemu upstream

[Ian Jackson]

Roger Pau Monné writes ("Re: [Xen-devel] [PATCH] Add optionals build configs for qemu upstream"):
> 2012/2/28 Fabio Fantoni <fantonifabio@tiscali.it>:
> > +CONFIG_QEMUU_DEBUG ?= n
> > +CONFIG_QEMUU_SPICE ?= n
> 
> It will be nice to add this as configure options, so a user can pass
> "--enable-qemu-debug" or "--enable-qemu-spice" to configure and the
> proper flags are set on the generated config/Tools.mk instead of
> setting them directly on .config or Config.mk. There are some examples
> of this on tools/configure.ac.

Yes.  I think that now that we have autoconf for the tools we should
use it for everything rather than having a mixture.

Would you care to do a patch to add the appropriate autoconf option ?
If you need help the autoconf documentation should be good and we will
help of course.

Thanks,
Ian.