aboutsummaryrefslogtreecommitdiff
path: root/target-ppc
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2011-04-08 20:08:25 +1000
committerAlexander Graf <agraf@suse.de>2011-04-08 12:20:08 +0200
commit6957785773e8a3cc8bd51f0e3172eaccbbaa5f3a (patch)
tree1f4205530bc626a5e76db236e339a1fe512d0b22 /target-ppc
parent3601ff11732160e42d3174d2821d873cfcd52a59 (diff)
downloadqemu-6957785773e8a3cc8bd51f0e3172eaccbbaa5f3a.zip
qemu-6957785773e8a3cc8bd51f0e3172eaccbbaa5f3a.tar.gz
qemu-6957785773e8a3cc8bd51f0e3172eaccbbaa5f3a.tar.bz2
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 <david@gibson.dropbear.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc')
-rw-r--r--target-ppc/kvm_ppc.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index 5afb308..45a1373 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);