From 72aaa6cec44568a8a09f9e233387024dd2807823 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 22 Jun 2012 12:30:58 +0100 Subject: [PATCH 1/3] cpu-common.h: Remove unnecessary guard on including targphys.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no need to make the include of targphys.h conditional on whether TARGET_PHYS_ADDR_BITS is defined, because targphys.h itself checks that and does nothing if it isn't. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber Signed-off-by: Stefan Hajnoczi --- cpu-common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index 1fe3280701..321037fbc0 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -3,9 +3,7 @@ /* CPU interfaces that are target independent. */ -#ifdef TARGET_PHYS_ADDR_BITS #include "targphys.h" -#endif #ifndef NEED_CPU_H #include "poison.h" From e58998c66d158dea6221e84c2738301ff7a7c434 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 22 Jun 2012 12:30:59 +0100 Subject: [PATCH 2/3] cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove an ifndef CONFIG_USER_ONLY guard that was pointless because it is already inside an if !defined(CONFIG_USER_ONLY). Signed-off-by: Peter Maydell Acked-by: Andreas Färber Signed-off-by: Stefan Hajnoczi --- cpu-common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index 321037fbc0..85548de5ea 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -69,9 +69,7 @@ void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len, void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque)); void cpu_unregister_map_client(void *cookie); -#ifndef CONFIG_USER_ONLY bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr); -#endif /* Coalesced MMIO regions are areas where write operations can be reordered. * This usually implies that write operations are side-effect free. This allows From f595e73713e9b206ac624afd0e48cc927857a3c0 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 28 Jun 2012 17:56:37 +0200 Subject: [PATCH 3/3] configure: Remove help for --disable-vnc-thread, --enable-vnc-thread Commit 2624bab836662d37f08336408a99d97652fc9c4d removed these configure arguments. Now the help text for both is removed, too. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- configure | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure b/configure index 9f071b7876..500fe24cba 100755 --- a/configure +++ b/configure @@ -1043,8 +1043,6 @@ echo " --disable-vnc-jpeg disable JPEG lossy compression for VNC server" echo " --enable-vnc-jpeg enable JPEG lossy compression for VNC server" echo " --disable-vnc-png disable PNG compression for VNC server (default)" echo " --enable-vnc-png enable PNG compression for VNC server" -echo " --disable-vnc-thread disable threaded VNC server" -echo " --enable-vnc-thread enable threaded VNC server" echo " --disable-curses disable curses output" echo " --enable-curses enable curses output" echo " --disable-curl disable curl connectivity"