Skip to contentSkip to conversation

Add optionals build configs for qemu upstream

PATCH In review Fabio Fantoni 4 participants 4 messages Feb 28, 2012 – Mar 1, 2012

lore
Share & tools
lore

Fabio Fantoni

author
#0 lore raw

PATCH 1/1 Add optionals build configs for qemu upstream

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 <[email protected]>
Config.mk +2 -0
index bc6be65..918aa7b 100644
@@ -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

README +0 -0
@@ -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

tools/Makefile +8 -0
@@ -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:

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 <[email protected]>
Config.mk +2 -0
index bc6be65..918aa7b 100644
@@ -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

README +2 -0
@@ -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

tools/Makefile +9 -0
@@ -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
[email protected]
http://lists.xen.org/xen-devel

#1 lore raw
Quoted 4 lines · Fabio Fantoni

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.

Quoted 60 lines
Signed-off-by Fabio Fantoni <[email protected]>
Config.mk +2 -1
index bc6be65..918aa7b 100644
@@ -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

README +2 -0
@@ -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

tools/Makefile +8 -0
@@ -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

tools/Makefile +0 -0
@@ -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:

#2 lore raw
In reply to Fabio Fantoni

2012/2/28 Fabio Fantoni <[email protected]>:

Quoted 15 lines

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 <[email protected]>
Config.mk +0 -0
index bc6be65..918aa7b 100644
@@ -203,6 +203,8 @@ ETHERBOOT_NICS ?= rtl8139 8086100e

 CONFIG_OVMF ?= n
 CONFIG_ROMBIOS ?= y
 CONFIG_SEABIOS ?= y

Config.mk

Quoted 2 lines
Config.mk +2 -0
+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.

Quoted 46 lines

 # 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

README +2 -0
@@ -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

tools/Makefile +0 -0
@@ -87,6 +87,14 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
              --interp-prefix=$(CROSS_SYS_ROOT)

 endif

tools/Makefile +8 -0
+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

tools/Makefile +0 -0
@@ -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

Quoted 7 lines

 subdir-clean-qemu-xen-dir:

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#3 lore raw

Roger Pau Monné writes ("Re: [Xen-devel] [PATCH] Add optionals build configs for qemu upstream"):

Quoted 9 lines

2012/2/28 Fabio Fantoni <[email protected]>:

Review

Quoted 2 lines
(quoted diff) +2 -0
+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.