← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to debian/patches/21_net_soopts.patch

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/21_net_soopts.patch
1
 
Index: linux-user/syscall.c
 
1
Index: qemu-0.10.0/linux-user/syscall.c
2
2
===================================================================
3
 
--- linux-user/syscall.c.orig   2008-01-06 20:38:42.000000000 +0100
4
 
+++ linux-user/syscall.c        2008-04-14 11:27:37.000000000 +0200
5
 
@@ -785,6 +785,28 @@
 
3
--- qemu-0.10.0.orig/linux-user/syscall.c       2009-03-07 13:46:58.000000000 +0100
 
4
+++ qemu-0.10.0/linux-user/syscall.c    2009-03-07 13:47:26.000000000 +0100
 
5
@@ -833,6 +833,28 @@
6
6
     return 0;
7
7
 }
8
8
 
31
31
 /* do_setsockopt() Must return target values and target errnos. */
32
32
 static abi_long do_setsockopt(int sockfd, int level, int optname,
33
33
                               abi_ulong optval_addr, socklen_t optlen)
34
 
@@ -835,7 +857,6 @@
 
34
@@ -883,7 +905,6 @@
35
35
         break;
36
36
     case TARGET_SOL_SOCKET:
37
37
         switch (optname) {
39
39
         case TARGET_SO_DEBUG:
40
40
                optname = SO_DEBUG;
41
41
                break;
42
 
@@ -892,17 +913,48 @@
 
42
@@ -940,17 +961,48 @@
43
43
         case TARGET_SO_SNDTIMEO:
44
44
                optname = SO_SNDTIMEO;
45
45
                break;
93
93
     default:
94
94
     unimplemented:
95
95
         gemu_log("Unsupported setsockopt level=%d optname=%d \n", level, optname);
96
 
@@ -922,13 +974,57 @@
 
96
@@ -971,13 +1023,57 @@
97
97
     case TARGET_SOL_SOCKET:
98
98
        level = SOL_SOCKET;
99
99
        switch (optname) {
154
154
         default:
155
155
             goto int_case;
156
156
         }
157
 
@@ -1171,16 +1267,23 @@
 
157
@@ -1236,6 +1332,12 @@
158
158
     void *addr;
159
159
     abi_long ret;
160
160
 
161
 
-    if (get_user_u32(addrlen, target_addrlen_addr))
162
 
-        return -TARGET_EFAULT;
163
 
-
164
 
-    addr = alloca(addrlen);
165
 
+    if (target_addrlen_addr != (target_ulong)NULL &&
166
 
+        target_addr != (target_ulong)NULL) {
167
 
+        if (get_user_u32(addrlen, target_addrlen_addr))
168
 
+            return -TARGET_EFAULT;
169
 
+        addr = alloca(addrlen);
170
 
+        ret = get_errno(accept(fd, addr, &addrlen));
171
 
+    } else {
 
161
+    if (target_addrlen_addr == (target_ulong)NULL ||
 
162
+       target_addr == (target_ulong)NULL) {
172
163
+        ret = get_errno(accept(fd, NULL, NULL));
173
 
+        return ret;
 
164
+       return ret;
174
165
+    }
 
166
+
 
167
     if (get_user_u32(addrlen, target_addrlen_addr))
 
168
         return -TARGET_EFAULT;
175
169
 
176
 
-    ret = get_errno(accept(fd, addr, &addrlen));
177
 
     if (!is_error(ret)) {
178
 
-        host_to_target_sockaddr(target_addr, addr, addrlen);
179
 
-        if (put_user_u32(addrlen, target_addrlen_addr))
180
 
-            ret = -TARGET_EFAULT;
181
 
+        if (target_addr != (target_ulong)NULL)
182
 
+            host_to_target_sockaddr(target_addr, addr, addrlen);
183
 
+        if (target_addrlen_addr != (target_ulong)NULL)
184
 
+            if (put_user_u32(addrlen, target_addrlen_addr))
185
 
+                ret = -TARGET_EFAULT;
186
 
     }
187
 
     return ret;
188
 
 }
189
 
Index: linux-user/syscall_defs.h
 
170
Index: qemu-0.10.0/linux-user/syscall_defs.h
190
171
===================================================================
191
 
--- linux-user/syscall_defs.h.orig      2008-01-06 20:38:42.000000000 +0100
192
 
+++ linux-user/syscall_defs.h   2008-04-14 11:26:14.000000000 +0200
 
172
--- qemu-0.10.0.orig/linux-user/syscall_defs.h  2009-03-07 13:46:58.000000000 +0100
 
173
+++ qemu-0.10.0/linux-user/syscall_defs.h       2009-03-07 13:47:26.000000000 +0100
193
174
@@ -114,6 +114,11 @@
194
175
     abi_long tv_nsec;
195
176
 };