Le 15/03/2020 à 13:20, cheng...@emindsoft.com.cn a écrit :
> From: Chen Gang <cheng...@emindsoft.com.cn>
>
> Another DRM_IOCTL_* commands will be done later.
>
> Signed-off-by: Chen Gang <cheng...@emindsoft.com.cn>
> ---
> linux-user/ioctls.h | 2 ++
> linux-user/syscall.c | 62 ++++++++++++++++++++++++++++++++++++++
> linux-user/syscall_defs.h | 15 +++++++++
> linux-user/syscall_types.h | 11 +++++++
> 4 files changed, 90 insertions(+)
>
> diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
> index 0defa1d8c1..3ae32cbfb1 100644
> --- a/linux-user/ioctls.h
> +++ b/linux-user/ioctls.h
> @@ -574,6 +574,8 @@
> IOCTL_SPECIAL(SIOCDELRT, IOC_W, do_ioctl_rt,
> MK_PTR(MK_STRUCT(STRUCT_rtentry)))
>
> + IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,
> + MK_PTR(MK_STRUCT(STRUCT_drm_version)))
Add a blank line here.
> #ifdef TARGET_TIOCSTART
> IOCTL_IGNORE(TIOCSTART)
> IOCTL_IGNORE(TIOCSTOP)
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 8d27d10807..2eb7c91ab4 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -112,6 +112,7 @@
> #include <linux/if_alg.h>
> #include <linux/rtc.h>
> #include <sound/asound.h>
> +#include <libdrm/drm.h>
I think you should check in configure that this file is available on the
system.
> #include "linux_loop.h"
> #include "uname.h"
>
> @@ -5196,6 +5197,67 @@ static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry
> *ie, uint8_t *buf_temp,
> }
> #endif
>
> +static inline abi_long target_to_host_drmversion(struct drm_version
> *host_ver,
> + abi_long target_addr)
> +{
> + struct target_drm_version *target_ver;
> +
> + if (!lock_user_struct(VERIFY_READ, target_ver, target_addr, 0)) {
> + return -TARGET_EFAULT;
> + }
> + __get_user(host_ver->name_len, &target_ver->name_len);
> + host_ver->name = host_ver->name_len ? g2h(target_ver->name) : NULL;
> + __get_user(host_ver->date_len, &target_ver->date_len);
> + host_ver->date = host_ver->date_len ? g2h(target_ver->date) : NULL;
> + __get_user(host_ver->desc_len, &target_ver->desc_len);
> + host_ver->desc = host_ver->desc_len ? g2h(target_ver->desc) : NULL;
> + unlock_user_struct(target_ver, target_addr, 0);
> + return 0;
> +}
> +
> +static inline abi_long host_to_target_drmversion(abi_ulong target_addr,
> + struct drm_version
> *host_ver)
> +{
> + struct target_drm_version *target_ver;
> +
> + if (!lock_user_struct(VERIFY_WRITE, target_ver, target_addr, 0)) {
> + return -TARGET_EFAULT;
> + }
> + __put_user(host_ver->version_major, &target_ver->version_major);
> + __put_user(host_ver->version_minor, &target_ver->version_minor);
> + __put_user(host_ver->version_patchlevel,
> &target_ver->version_patchlevel);
> + __put_user(host_ver->name_len, &target_ver->name_len);
> + __put_user(host_ver->date_len, &target_ver->date_len);
> + __put_user(host_ver->desc_len, &target_ver->desc_len);
> + unlock_user_struct(target_ver, target_addr, 0);
> + return 0;
> +}
> +
> +static abi_long do_ioctl_drm(const IOCTLEntry *ie, uint8_t *buf_temp,
> + int fd, int cmd, abi_long arg)
> +{
> + struct drm_version *ver;
> + abi_long ret;
> +
> + switch (ie->host_cmd) {
> + case DRM_IOCTL_VERSION:
> + ver = (struct drm_version *)buf_temp;
> + memset(ver, 0, sizeof(*ver));
> + ret = target_to_host_drmversion(ver, arg);
> + if (is_error(ret)) {
> + return ret;
> + }
> + ret = get_errno(safe_ioctl(fd, ie->host_cmd, ver));
> + if (is_error(ret)) {
> + return ret;
> + }
> + ret = host_to_target_drmversion(arg, ver);
> + return ret;
> + }
> + return -TARGET_EFAULT;
> +}
> +
> +
> static IOCTLEntry ioctl_entries[] = {
> #define IOCTL(cmd, access, ...) \
> { TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 152ec637cb..3c261cff0e 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -1167,6 +1167,9 @@ struct target_rtc_pll_info {
> #define TARGET_DM_TARGET_MSG TARGET_IOWRU(0xfd, 0x0e)
> #define TARGET_DM_DEV_SET_GEOMETRY TARGET_IOWRU(0xfd, 0x0f)
>
> +/* drm ioctls */
> +#define TARGET_DRM_IOCTL_VERSION TARGET_IOWRU('d', 0x00)
Why do you use the TARGET_IOWRU variant?
Can't you use TARGET_IOWR('d', 0x00, struct target_drm_version)?
Thanks,
Laurent
