reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-23 11:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

executor: fix inclusion of kvm arch-specific code

Browse Source 
We use GOOS now to figure out target arch
(which can be different from host arch).
This commit is contained in:
Dmitry Vyukov 2018-10-31 13:42:54 +01:00
parent 8978109043
commit 1f38e9aef7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
executor/common_linux.h
View File

@ -868,9 +868,9 @@ error:
#include <sys/ioctl.h>
#include <sys/stat.h>
#if defined(__x86_64__)
#if GOARCH_amd64
#include "common_kvm_amd64.h"
#elif defined(__aarch64__)
#elif GOARCH_arm64
#include "common_kvm_arm64.h"
#else
static long syz_kvm_setup_cpu(long a0, long a1, long a2, long a3, long a4, long a5, long a6, long a7)

4
pkg/csource/generated.go
View File

@ -1468,7 +1468,7 @@ error:
#include <sys/ioctl.h>
#include <sys/stat.h>
#if defined(__x86_64__)
#if GOARCH_amd64
const char kvm_asm16_cpl3[] = "\x0f\x20\xc0\x66\x83\xc8\x01\x0f\x22\xc0\xb8\xa0\x00\x0f\x00\xd8\xb8\x2b\x00\x8e\xd8\x8e\xc0\x8e\xe0\x8e\xe8\xbc\x00\x01\xc7\x06\x00\x01\x1d\xba\xc7\x06\x02\x01\x23\x00\xc7\x06\x04\x01\x00\x01\xc7\x06\x06\x01\x2b\x00\xcb";
const char kvm_asm32_paged[] = "\x0f\x20\xc0\x0d\x00\x00\x00\x80\x0f\x22\xc0";
const char kvm_asm32_vm86[] = "\x66\xb8\xb8\x00\x0f\x00\xd8\xea\x00\x00\x00\x00\xd0\x00";
@ -2340,7 +2340,7 @@ static uintptr_t syz_kvm_setup_cpu(uintptr_t a0, uintptr_t a1, uintptr_t a2, uin
return 0;
}
#elif defined(__aarch64__)
#elif GOARCH_arm64
struct kvm_text {
uintptr_t typ;