672f70aa3d
Update to 2.11.1, plus a few other fixes. OBS-URL: https://build.opensuse.org/request/show/579209 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=392
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 66779c72be83467bd5053d40f6c189c5238fc97a Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Tue, 14 Apr 2009 16:27:36 +0200
|
|
Subject: [PATCH] qemu-cvs-ioctl_nodirection
|
|
|
|
the direction given in the ioctl should be correct so we can assume the
|
|
communication is uni-directional. The alsa developers did not like this
|
|
concept though and declared ioctls IOC_R and IOC_W even though they were
|
|
IOC_RW.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
Signed-off-by: Ulrich Hecht <uli@suse.de>
|
|
---
|
|
linux-user/syscall.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index faf890774a..5288ee0078 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -5669,6 +5669,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
|
|
arg_type++;
|
|
target_size = thunk_type_size(arg_type, 0);
|
|
switch(ie->access) {
|
|
+ /* FIXME: actually the direction given in the ioctl should be
|
|
+ * correct so we can assume the communication is uni-directional.
|
|
+ * The alsa developers did not like this concept though and
|
|
+ * declared ioctls IOC_R and IOC_W even though they were IOC_RW.*/
|
|
+/*
|
|
case IOC_R:
|
|
ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
|
|
if (!is_error(ret)) {
|
|
@@ -5687,6 +5692,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
|
|
unlock_user(argptr, arg, 0);
|
|
ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
|
|
break;
|
|
+*/
|
|
default:
|
|
case IOC_RW:
|
|
argptr = lock_user(VERIFY_READ, arg, target_size, 1);
|