From fa5e64987e185c3cf586e55957ebaa78b8b891fd Mon Sep 17 00:00:00 2001
From: Tony Gutierrez <anthony.gutierrez@amd.com>
Date: Fri, 5 Aug 2016 17:15:19 -0400
Subject: [PATCH] sim: fix issues with pwrite(); don't enable fstatfs

this patch fixes issues with changeset 11593

use the host's pwrite() syscall for pwrite64Func(),
as opposed to pwrite64(), because pwrite64() does
not work well on all distros.

undo the enabling of fstatfs, as we will add this
in a separate pate.
---
 src/arch/x86/linux/process.cc | 2 +-
 src/sim/syscall_emul.hh       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 08137b943..f68f1c4c8 100644
--- a/src/arch/x86/linux/process.cc
+++ b/src/arch/x86/linux/process.cc
@@ -356,7 +356,7 @@ static SyscallDesc syscallDescs64[] = {
     /* 135 */ SyscallDesc("personality", unimplementedFunc),
     /* 136 */ SyscallDesc("ustat", unimplementedFunc),
     /* 137 */ SyscallDesc("statfs", unimplementedFunc),
-    /* 138 */ SyscallDesc("fstatfs", fstatfsFunc<X86Linux64>),
+    /* 138 */ SyscallDesc("fstatfs", unimplementedFunc),
     /* 139 */ SyscallDesc("sysfs", unimplementedFunc),
     /* 140 */ SyscallDesc("getpriority", unimplementedFunc),
     /* 141 */ SyscallDesc("setpriority", unimplementedFunc),
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 906a01edb..7cce9e9c0 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -64,6 +64,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
+#include <unistd.h>
 
 #include <cerrno>
 #include <string>
@@ -1406,7 +1407,7 @@ pwrite64Func(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc)
     BufferArg bufArg(bufPtr, nbytes);
     bufArg.copyIn(tc->getMemProxy());
 
-    int bytes_written = pwrite64(sim_fd, bufArg.bufferPtr(), nbytes, offset);
+    int bytes_written = pwrite(sim_fd, bufArg.bufferPtr(), nbytes, offset);
 
     return (bytes_written == -1) ? -errno : bytes_written;
 }
-- 
2.30.2