david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turn error_report() back to nyx_error()

Browse Source 
(error_report goes to qemu monitor, but we want to use log for easy redirect)
This commit is contained in:
Steffen Schulz 2022-11-21 04:24:32 -08:00 committed by Sergej Schumilo
parent 31c509b171
commit 56491f8d11
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vl.c
View File

@ -4632,32 +4632,32 @@ int main(int argc, char **argv, char **envp)
if ((snapshot_used || load_mode || skip_serialization) && if ((snapshot_used || load_mode || skip_serialization) &&
getenv("NYX_DISABLE_DIRTY_RING")) getenv("NYX_DISABLE_DIRTY_RING"))
{ {
error_report("NYX_DISABLE_DIRTY_RING is only allowed during " nyx_error("NYX_DISABLE_DIRTY_RING is only allowed during "
"pre-snapshot creation\n"); "pre-snapshot creation\n");
exit(1); exit(1);
} }
if ((pre_snapshot_used && !snapshot_used && !load_mode) && if ((pre_snapshot_used && !snapshot_used && !load_mode) &&
!getenv("NYX_DISABLE_DIRTY_RING")) !getenv("NYX_DISABLE_DIRTY_RING"))
{ {
error_report( nyx_error(
"NYX_DISABLE_DIRTY_RING is required during pre-snapshot creation\n"); "NYX_DISABLE_DIRTY_RING is required during pre-snapshot creation\n");
exit(1); exit(1);
} }
if (pre_snapshot_used && load_mode) { if (pre_snapshot_used && load_mode) {
error_report("invalid argument (pre_snapshot_used && load_mode)!\n"); nyx_error("invalid argument (pre_snapshot_used && load_mode)!\n");
exit(1); exit(1);
} }
if ((!snapshot_used && !pre_snapshot_used) && load_mode) { if ((!snapshot_used && !pre_snapshot_used) && load_mode) {
error_report("invalid argument ((!pre_snapshot_used && " nyx_error("invalid argument ((!pre_snapshot_used && "
"!pre_snapshot_used) && load_mode)!\n"); "!pre_snapshot_used) && load_mode)!\n");
exit(1); exit(1);
} }
if (pre_snapshot_used && snapshot_used) { if (pre_snapshot_used && snapshot_used) {
nyx_printf("[Qemu-Nyx]: loading pre image to start fuzzing...\n"); nyx_printf("Loading pre image to start fuzzing...\n");
set_fast_reload_mode(false); set_fast_reload_mode(false);
set_fast_reload_path(snapshot_path); set_fast_reload_path(snapshot_path);
if (!skip_serialization) { if (!skip_serialization) {
@ -4670,7 +4670,7 @@ int main(int argc, char **argv, char **envp)
fast_reload_init(GET_GLOBAL_STATE()->fast_reload_snapshot); fast_reload_init(GET_GLOBAL_STATE()->fast_reload_snapshot);
} else { } else {
if (pre_snapshot_used) { if (pre_snapshot_used) {
nyx_printf("[Qemu-Nyx]: preparing to create pre image...\n"); nyx_printf("Preparing to create pre image...\n");
set_fast_reload_pre_path(pre_snapshot_path); set_fast_reload_pre_path(pre_snapshot_path);
set_fast_reload_pre_image(); set_fast_reload_pre_image();
} else if (snapshot_used) { } else if (snapshot_used) {
@ -4681,7 +4681,7 @@ int main(int argc, char **argv, char **envp)
if (load_mode) { if (load_mode) {
set_fast_reload_mode(true); set_fast_reload_mode(true);
nyx_printf( nyx_printf(
"[Qemu-Nyx]: waiting for snapshot to start fuzzing...\n"); "Waiting for snapshot to start fuzzing...\n");
fast_reload_create_from_file(get_fast_reload_snapshot(), fast_reload_create_from_file(get_fast_reload_snapshot(),
snapshot_path, false); snapshot_path, false);
// cpu_synchronize_all_post_reset(); // cpu_synchronize_all_post_reset();
@ -4690,7 +4690,7 @@ int main(int argc, char **argv, char **envp)
skip_init(); skip_init();
// GET_GLOBAL_STATE()->pt_trace_mode = false; // GET_GLOBAL_STATE()->pt_trace_mode = false;
} else { } else {
nyx_printf("[Qemu-Nyx]: Booting VM to start fuzzing...\n"); nyx_printf("Booting VM to start fuzzing...\n");
set_fast_reload_mode(false); set_fast_reload_mode(false);
} }
} }