[COMMIT master] Define cpu_has_work() for ia64

From: Jes Sorensen j...@sgi.com Signed-off-by: Jes Sorensen j...@sgi.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/target-ia64/exec.h b/target-ia64/exec.h index 37b64f7..060d9c3 100644 --- a/target-ia64/exec.h +++ b/target-ia64/exec.h @@ -53,4 +53,9 @@ static inline int

[COMMIT master] Remove qemu_alloc_physram()

From: Avi Kivity a...@redhat.com Obsolete. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/vl.c b/vl.c index 0420634..6b4b7d2 100644 --- a/vl.c +++ b/vl.c @@ -4930,24 +4930,6 @@ static void *alloc_mem_area(size_t memory, unsigned long *len, const char *path) } #endif -static void

[COMMIT master] Do not build extboot on non-x86

From: Jes Sorensen j...@sgi.com [avi: make it build on x86] Signed-off-by: Jes Sorensen j...@sgi.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/Makefile b/Makefile index 8e4906f..72653c3 100644 --- a/Makefile +++ b/Makefile @@ -419,7 +419,12 @@ tarbin: .PHONY: kvm/extboot -all: