Skip to contentSkip to conversation

fix - do not build blobs when blobs are not needed

PATCH Applied Jes Sorensen 2 participants 4 messages May 7, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix - do not build blobs when blobs are not needed

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.

---
 Makefile  |    2 ++
 configure |    1 +
 2 files changed, 3 insertions(+)
Makefile +2 -0
Index: 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
configure +1 -0
Index: qemu-kvm/configure
===================================================================
@@ -356,6 +356,7 @@
      cpu_emulation="no"
      gdbstub="no"
      slirp="no"
+     blobs="no"
 fi
 if [ "$cpu" = "powerpc" ]; then
      kvm="yes"
#1 lore raw
Quoted 4 lines · 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.

.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)

Signature · 1 line
error compiling committee.c: too many arguments to function
#2 lore raw
Quoted 9 lines · Avi Kivity

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.

---
 Makefile |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Makefile +4 -1
Index: 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 $@
Applied
#3 lore raw
Quoted 4 lines · Jes Sorensen

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

This one works for me.

applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function