sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sim: Patch to fix the statfs build

Browse source 
See developers mailing list.  Trying to unbreak statfs.

Testing Done:
Builds on FreeBSD now.

Reviewed at http://reviews.gem5.org/r/3803/

Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
This commit is contained in:
Bjoern A. Zeeb 2017-02-09 19:03:55 -05:00
parent e07f0c5043
commit b673f2aaa4
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/sim/syscall_emul.hh
View file

@ -70,6 +70,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#if (NO_STATFS == 0) #if (NO_STATFS == 0)
#include <sys/statfs.h> #include <sys/statfs.h>
#else
#include <sys/mount.h>
#endif #endif
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
@ -527,21 +529,37 @@ copyOutStatfsBuf(SETranslatingPortProxy &mem, Addr addr,
{ {
TypedBufferArg<typename OS::tgt_statfs> tgt(addr); TypedBufferArg<typename OS::tgt_statfs> tgt(addr);
#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
tgt->f_type = 0;
#else
tgt->f_type = TheISA::htog(host->f_type); tgt->f_type = TheISA::htog(host->f_type);
#endif #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
tgt->f_bsize = TheISA::htog(host->f_iosize);
#else
tgt->f_bsize = TheISA::htog(host->f_bsize); tgt->f_bsize = TheISA::htog(host->f_bsize);
#endif
tgt->f_blocks = TheISA::htog(host->f_blocks); tgt->f_blocks = TheISA::htog(host->f_blocks);
tgt->f_bfree = TheISA::htog(host->f_bfree); tgt->f_bfree = TheISA::htog(host->f_bfree);
tgt->f_bavail = TheISA::htog(host->f_bavail); tgt->f_bavail = TheISA::htog(host->f_bavail);
tgt->f_files = TheISA::htog(host->f_files); tgt->f_files = TheISA::htog(host->f_files);
tgt->f_ffree = TheISA::htog(host->f_ffree); tgt->f_ffree = TheISA::htog(host->f_ffree);
memcpy(&tgt->f_fsid, &host->f_fsid, sizeof(host->f_fsid)); memcpy(&tgt->f_fsid, &host->f_fsid, sizeof(host->f_fsid));
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
tgt->f_namelen = TheISA::htog(host->f_namemax);
tgt->f_frsize = TheISA::htog(host->f_bsize);
#elif defined(__APPLE__)
tgt->f_namelen = 0;
tgt->f_frsize = 0;
#else
tgt->f_namelen = TheISA::htog(host->f_namelen); tgt->f_namelen = TheISA::htog(host->f_namelen);
tgt->f_frsize = TheISA::htog(host->f_frsize); tgt->f_frsize = TheISA::htog(host->f_frsize);
#endif
#if defined(__linux__)
memcpy(&tgt->f_spare, &host->f_spare, sizeof(host->f_spare)); memcpy(&tgt->f_spare, &host->f_spare, sizeof(host->f_spare));
#else
/*
* The fields are different sizes per OS. Don't bother with
* f_spare or f_reserved on non-Linux for now.
*/
memset(&tgt->f_spare, 0, sizeof(tgt->f_spare));
#endif
tgt.copyOut(mem); tgt.copyOut(mem);
} }