christoph/fail
1
Fork 0
Code Releases Activity

qemu: Fail* startup hook

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1616 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-09-12 14:07:07 +00:00
parent e715149033
commit 6223759471
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/qemu.cmake
View File

@ -50,7 +50,7 @@ if(BUILD_QEMU)
# make sure aspects don't fail to match in entry.cc # make sure aspects don't fail to match in entry.cc
include_directories(${PROJECT_SOURCE_DIR}/src/core ${CMAKE_BINARY_DIR}/src/core) include_directories(${PROJECT_SOURCE_DIR}/src/core ${CMAKE_BINARY_DIR}/src/core)
add_executable(fail-client "${qemu_lib}") add_executable(fail-client "${qemu_lib}")
target_link_libraries(fail-client "${qemu_lib}" fail ${qemu_library_dependencies}) target_link_libraries(fail-client -Wl,-whole-archive "${qemu_lib}" -Wl,-no-whole-archive fail ${qemu_library_dependencies})
install(TARGETS fail-client RUNTIME DESTINATION bin) install(TARGETS fail-client RUNTIME DESTINATION bin)
# a few QEMU-specific passthrough targets: # a few QEMU-specific passthrough targets:

2
src/core/config/FailConfig.hpp.in
View File

@ -34,5 +34,7 @@
#cmakedefine CLIENT_RAND_BACKOFF_TSTART @CLIENT_RAND_BACKOFF_TSTART@ #cmakedefine CLIENT_RAND_BACKOFF_TSTART @CLIENT_RAND_BACKOFF_TSTART@
#cmakedefine CLIENT_RAND_BACKOFF_TEND @CLIENT_RAND_BACKOFF_TEND@ #cmakedefine CLIENT_RAND_BACKOFF_TEND @CLIENT_RAND_BACKOFF_TEND@
#cmakedefine CLIENT_RETRY_COUNT @CLIENT_RETRY_COUNT@ #cmakedefine CLIENT_RETRY_COUNT @CLIENT_RETRY_COUNT@
#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
#define FAIL_VERSION PROJECT_VERSION
#endif // __FAIL_CONFIG_HPP__ #endif // __FAIL_CONFIG_HPP__

1
src/core/sal/CMakeLists.txt
View File

@ -41,6 +41,7 @@ elseif(BUILD_QEMU)
SimulatorController.cc SimulatorController.cc
qemu/QEMUController.cc qemu/QEMUController.cc
qemu/QEMUListener.cc qemu/QEMUListener.cc
qemu/wrappers.cc
) )
endif(BUILD_BOCHS) endif(BUILD_BOCHS)

16
src/core/sal/qemu/wrappers.cc Normal file
View File

@ -0,0 +1,16 @@
#include "../SALInst.hpp"
#include "config/FailConfig.hpp"
extern "C" {
#include <stdio.h>
//#include "qemu/failqemu.h"
struct CPUX86State;
void failqemu_init(struct CPUX86State *env)
{
printf("FailQEMU v%s\n", FAIL_VERSION);
fail::simulator.startup();
}
}