ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging 

* stefanha/trivial-patches:
  configure: Remove help for --disable-vnc-thread, --enable-vnc-thread
  cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY
  cpu-common.h: Remove unnecessary guard on including targphys.h
This commit is contained in:
Anthony Liguori 2012-07-09 09:51:06 -05:00
parent 84988cf910 f595e73713
commit 8665817e89
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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 " --enable-vnc-jpeg enable JPEG lossy compression for VNC server"
echo " --disable-vnc-png disable PNG compression for VNC server (default)" echo " --disable-vnc-png disable PNG compression for VNC server (default)"
echo " --enable-vnc-png enable PNG compression for VNC server" 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 " --disable-curses disable curses output"
echo " --enable-curses enable curses output" echo " --enable-curses enable curses output"
echo " --disable-curl disable curl connectivity" echo " --disable-curl disable curl connectivity"

4
cpu-common.h
View File

@ -3,9 +3,7 @@
/* CPU interfaces that are target independent. */ /* CPU interfaces that are target independent. */
#ifdef TARGET_PHYS_ADDR_BITS
#include "targphys.h" #include "targphys.h"
#endif
#ifndef NEED_CPU_H #ifndef NEED_CPU_H
#include "poison.h" #include "poison.h"
@ -71,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_register_map_client(void *opaque, void (*callback)(void *opaque));
void cpu_unregister_map_client(void *cookie); void cpu_unregister_map_client(void *cookie);
#ifndef CONFIG_USER_ONLY
bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr); bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr);
#endif
/* Coalesced MMIO regions are areas where write operations can be reordered. /* Coalesced MMIO regions are areas where write operations can be reordered.
* This usually implies that write operations are side-effect free. This allows * This usually implies that write operations are side-effect free. This allows