From: David Gibson Date: Fri, 8 Apr 2011 10:08:25 +0000 (+1000) Subject: ppce500_mpc8544ds: Fix compile with --enable-debug and --disable-kvm X-Git-Tag: v0.15.0-rc0~529 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6957785773e8a3cc8bd51f0e3172eaccbbaa5f3a;p=thirdparty%2Fqemu.git ppce500_mpc8544ds: Fix compile with --enable-debug and --disable-kvm When configured with --enable-debug, we compile without optimization. This means that the function mpc8544_copy_soc_cell() in ppce500_mpc8544ds.c is not optimized out, even though it is never called without kvm. That in turn causes a link failure, because it calls the function kvmppc_read_host_property() which is in kvm_ppc.o and therefore not included in a --disable-kvm build. This patch fixes the problem by providing a dummy stub for kvmppc_read_host_property() in kvm_ppc.h when !CONFIG_KVM. Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index 5afb308477a..45a1373b281 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -11,8 +11,17 @@ void kvmppc_init(void); void kvmppc_fdt_update(void *fdt); +#ifndef CONFIG_KVM +static inline int kvmppc_read_host_property(const char *node_path, const char *prop, + void *val, size_t len) +{ + assert(0); + return -ENOSYS; +} +#else int kvmppc_read_host_property(const char *node_path, const char *prop, void *val, size_t len); +#endif uint32_t kvmppc_get_tbfreq(void); int kvmppc_get_hypercall(CPUState *env, uint8_t *buf, int buf_len);