[patch] fix - do not build blobs when blobs are not needed

2009-05-07 Thread Jes Sorensen

Hi,

Don't like ugly assembler errors because QEMU tries to build some x86
assembly code which isn't needed on non-x86.

Jes
Do not try to build extboot when INSTALL_BLOBS is not set.

Signed-off-by: Jes Sorensen j...@sgi.com

---
 Makefile  |2 ++
 configure |1 +
 2 files changed, 3 insertions(+)

Index: qemu-kvm/Makefile
===
--- qemu-kvm.orig/Makefile
+++ qemu-kvm/Makefile
@@ -419,6 +419,7 @@
 
 .PHONY: kvm/extboot
 
+ifdef INSTALL_BLOBS
 all: kvm/extboot
 
 kvm/extboot:
@@ -427,3 +428,4 @@
|| ! cmp -s pc-bios/extboot.bin $@/extboot.bin; then \
 		cp $@/extboot.bin pc-bios/extboot.bin; \
 	fi
+endif
Index: qemu-kvm/configure
===
--- qemu-kvm.orig/configure
+++ qemu-kvm/configure
@@ -356,6 +356,7 @@
  cpu_emulation=no
  gdbstub=no
  slirp=no
+ blobs=no
 fi
 if [ $cpu = powerpc ]; then
  kvm=yes


Re: [patch] fix - do not build blobs when blobs are not needed

2009-05-07 Thread Avi Kivity

Jes Sorensen wrote:

Hi,

Don't like ugly assembler errors because QEMU tries to build some x86
assembly code which isn't needed on non-x86.


.PHONY: kvm/extboot

+ifdef INSTALL_BLOBS
all: kvm/extboot

kvm/extboot:
@@ -427,3 +428,4 @@
   || ! cmp -s pc-bios/extboot.bin $@/extboot.bin; then \
cp $@/extboot.bin pc-bios/extboot.bin; \
fi
+endif
Index: qemu-kvm/configure
===
--- qemu-kvm.orig/configure
+++ qemu-kvm/configure
@@ -356,6 +356,7 @@
 cpu_emulation=no
 gdbstub=no
 slirp=no
+ blobs=no
fi
if [ $cpu = powerpc ]; then
 kvm=yes


Seems a bit heavy handed.  blobs != extboot.

How about instead:

   build-targets-x86 = kvm/extboot

   all: $(build-targets-$(ARCH))

(or something similar that builds)

--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [patch] fix - do not build blobs when blobs are not needed

2009-05-07 Thread Jes Sorensen

Avi Kivity wrote:

Seems a bit heavy handed.  blobs != extboot.

How about instead:

   build-targets-x86 = kvm/extboot

   all: $(build-targets-$(ARCH))

(or something similar that builds)


There's no problem that cannot be fixed by applying an appropriately
large hammer  :-)

This one works for me.

Jes

Do not try to build extboot on non-x86.

Signed-off-by: Jes Sorensen j...@sgi.com

---
 Makefile |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: qemu-kvm/Makefile
===
--- qemu-kvm.orig/Makefile
+++ qemu-kvm/Makefile
@@ -419,7 +419,10 @@
 
 .PHONY: kvm/extboot
 
-all: kvm/extboot
+build-targets-x86  = kvm/extboot
+build-targets-ia64 =
+
+all: $(build-targets-$(ARCH))
 
 kvm/extboot:
 	$(MAKE) -C $@


Re: [patch] fix - do not build blobs when blobs are not needed

2009-05-07 Thread Avi Kivity

Jes Sorensen wrote:

There's no problem that cannot be fixed by applying an appropriately
large hammer  :-)

This one works for me.


applied, thanks.

--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html