qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 1/5] ppce500_mpc8544ds: Fix compile with --enable-de


From: David Gibson
Subject: [Qemu-devel] [PATCH 1/5] ppce500_mpc8544ds: Fix compile with --enable-debug and --disable-kvm
Date: Thu, 7 Apr 2011 13:02:01 +1000

From: Alexey Kardashevskiy <address@hidden>

When configured with --enable-debug, the makefile does not use any
optimization and compilation of hw/ppce500_mpc8544ds.c fails because gcc
does not remove the never called without kvm function
mpc8544_copy_soc_cell(), which will fail to link without the kvm code.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
 hw/ppce500_mpc8544ds.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index b7670ae..33ded44 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -50,7 +50,7 @@
 #define MPC8544_PCI_IO             0xE1000000
 #define MPC8544_PCI_IOLEN          0x10000
 
-#ifdef CONFIG_FDT
+#if defined(CONFIG_FDT) && defined(CONFIG_KVM)
 static int mpc8544_copy_soc_cell(void *fdt, const char *node, const char *prop)
 {
     uint32_t cell;
@@ -81,7 +81,7 @@ static int mpc8544_load_device_tree(target_phys_addr_t addr,
                                      const char *kernel_cmdline)
 {
     int ret = -1;
-#ifdef CONFIG_FDT
+#if defined(CONFIG_FDT) && defined(CONFIG_KVM)
     uint32_t mem_reg_property[] = {0, ramsize};
     char *filename;
     int fdt_size;
-- 
1.7.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]