mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
Linux-user updates for Qemu 2.11
-----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEE/4IDyMORmK4FgUHvtEiQ3t48m8AFAlnnRv4XHHJpa3Uudm9p cGlvQGxpbmFyby5vcmcACgkQtEiQ3t48m8D1hw/8Cu/gXcWzHPxoqU/Bz9lSMS0+ 1UICiGBVNBcrs7QapG+Z4mI4goGcxjFKFEFgHuuvQTb91ONR43jIx4cNryOlu3jS 9njiHkgY7EeKXf84uPToie9WiXvf2IMI6wKdqJ53htJ8/Y1putbJ2CGf7c8vGIGh 9WhNGbiQyhpWU3xrEThVptUz+CVOqXxBYVKff0krG7ZSyODhrybPDkp8D020rXa1 O7oc8pAvwpYWiqpp+iiEU5PXFB7DoLUldefqqZQw+Rgntu6sEU+Rum7ykA2d6jBR o0YldbJeU2eq2Kh9EqJHDbTZwevTeul6NEcgd6ZoJkTDhOSDK9mMd6jkkRUHzf+u OAlGFFmfdqf9NE5S38XIMRHykwgMtWzQNU2MVLtalkEcadbOy7RnY/lOE/uEACh4 Ao/GPMDCar7nYR2Ga/P9LXFhR90hbvvvRAB10l7TIgE6/EJJUJs9E0HxC5ktsonv gC4tMTejhCwe61Neb0Z9b2gxSkwznJYe9OdTa13CENXMAy3AqPUTsDY91Y80HdpX 3rE869VSHMIQNuyNecCrUeHyKYkLoB+qGmavtO7m1RNEUeWTPP2WSDMCVKxVT4bg ol0UeTOwy0hGm2MUwn3scL+yMEVWjcEyInWDZCCGIvJMxfnwkqAMTO0xZXAIE8n0 bBHdQ4xVsujMIDmQcO0= =9fWY -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20171018' into staging Linux-user updates for Qemu 2.11 # gpg: Signature made Wed 18 Oct 2017 13:20:14 BST # gpg: using RSA key 0xB44890DEDE3C9BC0 # gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>" # gpg: aka "Riku Voipio <riku.voipio@linaro.org>" # Primary key fingerprint: FF82 03C8 C391 98AE 0581 41EF B448 90DE DE3C 9BC0 * remotes/riku/tags/pull-linux-user-20171018: linux-user: Fix TARGET_MTIOCTOP/MTIOCGET/MTIOCPOS values linux-user/main: support dfilter linux-user: Fix target FS_IOC_GETFLAGS and FS_IOC_SETFLAGS numbers linux-user/sh4: Reduce TARGET_VIRT_ADDR_SPACE_BITS to 31 linux-user: Tidy and enforce reserved_va initialization tcg: Fix off-by-one in assert in page_set_flags linux-user: Allow -R values up to 0xffff0000 for 32-bit ARM guests linux-user: remove duplicate break in syscall target/m68k,linux-user: manage FP registers in ucontext linux-user: fix O_TMPFILE handling Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
f2a48d696c
11 changed files with 140 additions and 24 deletions
|
@ -1108,8 +1108,8 @@ struct target_pollfd {
|
|||
/* Note that the ioctl numbers claim type "long" but the actual type
|
||||
* used by the kernel is "int".
|
||||
*/
|
||||
#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, long)
|
||||
#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, long)
|
||||
#define TARGET_FS_IOC_GETFLAGS TARGET_IOR('f', 1, abi_long)
|
||||
#define TARGET_FS_IOC_SETFLAGS TARGET_IOW('f', 2, abi_long)
|
||||
|
||||
#define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
|
||||
|
||||
|
@ -2423,7 +2423,7 @@ struct target_statfs64 {
|
|||
#define TARGET_O_CLOEXEC 010000000
|
||||
#define TARGET___O_SYNC 000100000
|
||||
#define TARGET_O_PATH 020000000
|
||||
#elif defined(TARGET_ARM) || defined(TARGET_M68K)
|
||||
#elif defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_AARCH64)
|
||||
#define TARGET_O_DIRECTORY 040000 /* must be a directory */
|
||||
#define TARGET_O_NOFOLLOW 0100000 /* don't follow links */
|
||||
#define TARGET_O_DIRECT 0200000 /* direct disk access hint */
|
||||
|
@ -2520,6 +2520,12 @@ struct target_statfs64 {
|
|||
#ifndef TARGET_O_PATH
|
||||
#define TARGET_O_PATH 010000000
|
||||
#endif
|
||||
#ifndef TARGET___O_TMPFILE
|
||||
#define TARGET___O_TMPFILE 020000000
|
||||
#endif
|
||||
#ifndef TARGET_O_TMPFILE
|
||||
#define TARGET_O_TMPFILE (TARGET___O_TMPFILE | TARGET_O_DIRECTORY)
|
||||
#endif
|
||||
#ifndef TARGET_O_NDELAY
|
||||
#define TARGET_O_NDELAY TARGET_O_NONBLOCK
|
||||
#endif
|
||||
|
@ -2713,9 +2719,34 @@ struct target_f_owner_ex {
|
|||
#define TARGET_VFAT_IOCTL_READDIR_BOTH TARGET_IORU('r', 1)
|
||||
#define TARGET_VFAT_IOCTL_READDIR_SHORT TARGET_IORU('r', 2)
|
||||
|
||||
#define TARGET_MTIOCTOP TARGET_IOW('m', 1, struct mtop)
|
||||
#define TARGET_MTIOCGET TARGET_IOR('m', 2, struct mtget)
|
||||
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct mtpos)
|
||||
struct target_mtop {
|
||||
abi_short mt_op;
|
||||
abi_int mt_count;
|
||||
};
|
||||
|
||||
#if defined(TARGET_SPARC) || defined(TARGET_MIPS)
|
||||
typedef abi_long target_kernel_daddr_t;
|
||||
#else
|
||||
typedef abi_int target_kernel_daddr_t;
|
||||
#endif
|
||||
|
||||
struct target_mtget {
|
||||
abi_long mt_type;
|
||||
abi_long mt_resid;
|
||||
abi_long mt_dsreg;
|
||||
abi_long mt_gstat;
|
||||
abi_long mt_erreg;
|
||||
target_kernel_daddr_t mt_fileno;
|
||||
target_kernel_daddr_t mt_blkno;
|
||||
};
|
||||
|
||||
struct target_mtpos {
|
||||
abi_long mt_blkno;
|
||||
};
|
||||
|
||||
#define TARGET_MTIOCTOP TARGET_IOW('m', 1, struct target_mtop)
|
||||
#define TARGET_MTIOCGET TARGET_IOR('m', 2, struct target_mtget)
|
||||
#define TARGET_MTIOCPOS TARGET_IOR('m', 3, struct target_mtpos)
|
||||
|
||||
struct target_sysinfo {
|
||||
abi_long uptime; /* Seconds since boot */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue