public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* qemu-kvm updated to 0.12.1.2.

Browse Source 
svn path=/nixpkgs/trunk/; revision=19192
This commit is contained in:
Eelco Dolstra 2010-01-03 19:36:32 +00:00
parent e3c2b77c11
commit 3f255b35cd
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@ -3,11 +3,11 @@
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qemu-kvm-0.11.1"; name = "qemu-kvm-0.12.1.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/kvm/${name}.tar.gz"; url = "mirror://sourceforge/kvm/${name}.tar.gz";
sha256 = "12s5v35krd7m7s4blf75ml4lwmw19kiygg3al0shy7xvza4vbxbx"; sha256 = "1k5xx9rn0n311bgvl6g9c8h1bxj2nhjpjpzbngy0sf9hdjidnba7";
}; };
patches = [ ./unix-domain.patch ]; patches = [ ./unix-domain.patch ];

72
pkgs/os-specific/linux/qemu-kvm/unix-domain.patch
View File

@ -1,9 +1,9 @@
diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.c qemu-kvm-0.11.0-rc1/slirp/socket.c diff -rc --exclude '*~' qemu-kvm-0.12.1.2-orig/slirp/socket.c qemu-kvm-0.12.1.2/slirp/socket.c
*** qemu-kvm-0.11.0-rc1-orig/slirp/socket.c 2009-08-02 15:38:42.000000000 +0200 *** qemu-kvm-0.12.1.2-orig/slirp/socket.c 2009-12-29 21:46:34.000000000 +0100
--- qemu-kvm-0.11.0-rc1/slirp/socket.c 2009-08-21 17:11:21.000000000 +0200 --- qemu-kvm-0.12.1.2/slirp/socket.c 2010-01-03 20:24:11.000000000 +0100
*************** ***************
*** 587,592 **** *** 588,593 ****
--- 587,593 ---- --- 588,594 ----
u_int lport, int flags) u_int lport, int flags)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
@ -12,7 +12,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.c qemu-kvm-0.11.0-
int s, opt = 1; int s, opt = 1;
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
*************** ***************
*** 621,633 **** *** 622,634 ****
so->so_lport = lport; /* Kept in network format */ so->so_lport = lport; /* Kept in network format */
so->so_laddr.s_addr = laddr; /* Ditto */ so->so_laddr.s_addr = laddr; /* Ditto */
@ -20,37 +20,37 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.c qemu-kvm-0.11.0-
! addr.sin_addr.s_addr = haddr; ! addr.sin_addr.s_addr = haddr;
! addr.sin_port = hport; ! addr.sin_port = hport;
! if (((s = socket(AF_INET,SOCK_STREAM,0)) < 0) || ! if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) < 0) ||
(setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0) || (setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0) ||
! (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) || ! (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) ||
(listen(s,1) < 0)) { (listen(s,1) < 0)) {
int tmperrno = errno; /* Don't clobber the real reason we failed */ int tmperrno = errno; /* Don't clobber the real reason we failed */
--- 622,643 ---- --- 623,644 ----
so->so_lport = lport; /* Kept in network format */ so->so_lport = lport; /* Kept in network format */
so->so_laddr.s_addr = laddr; /* Ditto */ so->so_laddr.s_addr = laddr; /* Ditto */
! so->so_uds = ntohs(hport) >= 0xff00; ! so->so_uds = ntohs(hport) >= 0xff00;
!
! if (so->so_uds) {
! addr_un.sun_family = AF_UNIX;
! sprintf(addr_un.sun_path, "./%d.socket", ntohs(hport));
! unlink(addr_un.sun_path);
! } else {
! addr.sin_family = AF_INET;
! addr.sin_addr.s_addr = haddr;
! addr.sin_port = hport;
! }
! if (so->so_uds) { ! if (((s = qemu_socket(so->so_uds ? PF_UNIX : AF_INET, SOCK_STREAM, 0)) < 0) ||
! addr_un.sun_family = AF_UNIX;
! sprintf(addr_un.sun_path, "./%d.socket", ntohs(hport));
! unlink(addr_un.sun_path);
! } else {
! addr.sin_family = AF_INET;
! addr.sin_addr.s_addr = haddr;
! addr.sin_port = hport;
! }
!
! if (((s = socket(so->so_uds ? PF_UNIX : AF_INET, SOCK_STREAM, 0)) < 0) ||
(setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0) || (setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)) < 0) ||
! (bind(s, so->so_uds ? (struct sockaddr *) &addr_un : (struct sockaddr *) &addr, ! (bind(s, so->so_uds ? (struct sockaddr *) &addr_un : (struct sockaddr *) &addr,
! so->so_uds ? sizeof(addr_un) : sizeof(addr)) < 0) || ! so->so_uds ? sizeof(addr_un) : sizeof(addr)) < 0) ||
(listen(s,1) < 0)) { (listen(s,1) < 0)) {
int tmperrno = errno; /* Don't clobber the real reason we failed */ int tmperrno = errno; /* Don't clobber the real reason we failed */
*************** ***************
*** 643,654 **** *** 644,655 ****
} }
setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int)); setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
@ -63,7 +63,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.c qemu-kvm-0.11.0-
so->s = s; so->s = s;
return so; return so;
--- 653,669 ---- --- 654,670 ----
} }
setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int)); setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
@ -81,9 +81,9 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.c qemu-kvm-0.11.0-
so->s = s; so->s = s;
return so; return so;
diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.h qemu-kvm-0.11.0-rc1/slirp/socket.h diff -rc --exclude '*~' qemu-kvm-0.12.1.2-orig/slirp/socket.h qemu-kvm-0.12.1.2/slirp/socket.h
*** qemu-kvm-0.11.0-rc1-orig/slirp/socket.h 2009-08-02 15:38:42.000000000 +0200 *** qemu-kvm-0.12.1.2-orig/slirp/socket.h 2009-12-29 21:46:34.000000000 +0100
--- qemu-kvm-0.11.0-rc1/slirp/socket.h 2009-08-21 17:02:36.000000000 +0200 --- qemu-kvm-0.12.1.2/slirp/socket.h 2010-01-03 20:20:50.000000000 +0100
*************** ***************
*** 33,39 **** *** 33,39 ****
struct in_addr so_laddr; /* local host table entry */ struct in_addr so_laddr; /* local host table entry */
@ -102,11 +102,11 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/socket.h qemu-kvm-0.11.0-
u_int8_t so_iptos; /* Type of service */ u_int8_t so_iptos; /* Type of service */
u_int8_t so_emu; /* Is the socket emulated? */ u_int8_t so_emu; /* Is the socket emulated? */
diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.0-rc1/slirp/tcp_subr.c diff -rc --exclude '*~' qemu-kvm-0.12.1.2-orig/slirp/tcp_subr.c qemu-kvm-0.12.1.2/slirp/tcp_subr.c
*** qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c 2009-08-02 15:38:42.000000000 +0200 *** qemu-kvm-0.12.1.2-orig/slirp/tcp_subr.c 2009-12-29 21:46:34.000000000 +0100
--- qemu-kvm-0.11.0-rc1/slirp/tcp_subr.c 2009-08-21 17:21:37.000000000 +0200 --- qemu-kvm-0.12.1.2/slirp/tcp_subr.c 2010-01-03 20:20:50.000000000 +0100
*************** ***************
*** 382,388 **** *** 383,389 ****
Slirp *slirp = inso->slirp; Slirp *slirp = inso->slirp;
struct socket *so; struct socket *so;
struct sockaddr_in addr; struct sockaddr_in addr;
@ -114,7 +114,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.
struct tcpcb *tp; struct tcpcb *tp;
int s, opt; int s, opt;
--- 382,389 ---- --- 383,390 ----
Slirp *slirp = inso->slirp; Slirp *slirp = inso->slirp;
struct socket *so; struct socket *so;
struct sockaddr_in addr; struct sockaddr_in addr;
@ -124,7 +124,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.
int s, opt; int s, opt;
*************** ***************
*** 412,418 **** *** 413,419 ****
(void) tcp_mss(sototcpcb(so), 0); (void) tcp_mss(sototcpcb(so), 0);
@ -132,7 +132,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.
tcp_close(sototcpcb(so)); /* This will sofree() as well */ tcp_close(sototcpcb(so)); /* This will sofree() as well */
return; return;
} }
--- 413,422 ---- --- 414,423 ----
(void) tcp_mss(sototcpcb(so), 0); (void) tcp_mss(sototcpcb(so), 0);
@ -144,7 +144,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.
return; return;
} }
*************** ***************
*** 424,434 **** *** 425,435 ****
opt = 1; opt = 1;
setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int)); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int));
@ -156,7 +156,7 @@ diff -rc --exclude '*~' qemu-kvm-0.11.0-rc1-orig/slirp/tcp_subr.c qemu-kvm-0.11.
/* Close the accept() socket, set right state */ /* Close the accept() socket, set right state */
if (inso->so_state & SS_FACCEPTONCE) { if (inso->so_state & SS_FACCEPTONCE) {
--- 428,443 ---- --- 429,444 ----
opt = 1; opt = 1;
setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int)); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int));