summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-15 12:09:31 +0100
committerRiku Voipio <riku.voipio@linaro.org>2016-07-19 16:18:11 +0300
commita57f1f8f52aec5c83e63ddf274fd18e2eece5f2b (patch)
treef81e38c16c999df036d630bb1cbcd6113ddef068
parent74642d091a9e7d5ece11ced18193e1f37d7e0553 (diff)
downloadfocaccia-qemu-a57f1f8f52aec5c83e63ddf274fd18e2eece5f2b.tar.gz
focaccia-qemu-a57f1f8f52aec5c83e63ddf274fd18e2eece5f2b.zip
linux-user: Fix type for SIOCATMARK ioctl
The SIOCATMARK ioctl takes an argument which should be a
pointer to an integer where the kernel will write the result.
We were incorrectly declaring it as TYPE_NULL which would mean
it would always fail (with EFAULT) when it should succeed.
Correct the type.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rw-r--r--linux-user/ioctls.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 4b36baae93..7e2c133ba1 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -120,7 +120,7 @@
                    MK_PTR(MK_STRUCT(STRUCT_fiemap)))
 #endif
 
-  IOCTL(SIOCATMARK, 0, TYPE_NULL)
+  IOCTL(SIOCATMARK, IOC_R, MK_PTR(TYPE_INT))
   IOCTL(SIOCGIFNAME, IOC_RW, MK_PTR(TYPE_INT))
   IOCTL(SIOCGIFFLAGS, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_short_ifreq)))
   IOCTL(SIOCSIFFLAGS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_short_ifreq)))