Date: Sat, 16 Dec 2006 23:27:19 +0100 (CET) From: Juergen Lock <nox@jelal.kn-bremen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/106820: update emulators/qemu to 20061216 snapshot, fix usb host support Message-ID: <200612162227.kBGMRJUV024598@saturn.kn-bremen.de> Resent-Message-ID: <200612162230.kBGMURBK064338@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106820 >Category: ports >Synopsis: update emulators/qemu to 20061216 snapshot, fix usb host support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 16 22:30:26 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 6.1-RELEASE-p5 i386 >Organization: me? organized?? >Environment: System: FreeBSD saturn 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #0: Mon Sep 4 15:37:14 CEST 2006 nox@saturn:/ad4/usr/home/nox/src61/src/sys/i386/compile/GENERICua i386 >Description: - update to 20061216 snapshot - fix usb host support (thx Lonnie Mendez!) >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- Makefile 15 Dec 2006 08:17:38 -0000 1.61 +++ Makefile 16 Dec 2006 21:07:37 -0000 @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 0.8.2s.20061214 +PORTVERSION= 0.8.2s.20061216 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ @@ -14,7 +14,7 @@ http://www.volny.cz/xnavara/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \ http://people.freebsd.org/~maho/qemu/:misc -DISTNAME= ${PORTNAME}-snapshot-2006-12-14_05 +DISTNAME= ${PORTNAME}-snapshot-2006-12-16_05 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot DIST_SUBDIR= qemu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v retrieving revision 1.36 diff -u -r1.36 distinfo --- distinfo 15 Dec 2006 08:17:38 -0000 1.36 +++ distinfo 16 Dec 2006 21:08:21 -0000 @@ -1,6 +1,6 @@ -MD5 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = bcd7f7dec32f8dec6eb5b98068a631b2 -SHA256 (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 4111586f06f185c870f0439ca93b46eb089161bd5a42379633b5bd7d10f10469 -SIZE (qemu/qemu-snapshot-2006-12-14_05.tar.bz2) = 1501881 +MD5 (qemu/qemu-snapshot-2006-12-16_05.tar.bz2) = 95be2bf3a0a76506bef0d71de025014f +SHA256 (qemu/qemu-snapshot-2006-12-16_05.tar.bz2) = 1e431b37ce64ba1c982e620eb2f89bc653f891fbf6a99edc28b27726eb92ac8d +SIZE (qemu/qemu-snapshot-2006-12-16_05.tar.bz2) = 1502556 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11 SIZE (qemu/patch3_cirrus) = 8817 Index: files/patch-bsdusb.patch =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-bsdusb.patch,v retrieving revision 1.5 diff -u -r1.5 patch-bsdusb.patch --- files/patch-bsdusb.patch 7 Aug 2006 16:10:27 -0000 1.5 +++ files/patch-bsdusb.patch 16 Dec 2006 21:09:36 -0000 @@ -59,7 +59,7 @@ + return NULL; +} Index: qemu/usb-bsd.c -@@ -0,0 +1,603 @@ +@@ -0,0 +1,600 @@ +/* + * BSD host USB redirector + * @@ -264,23 +264,20 @@ + } +} + -+static int usb_host_handle_data(USBDevice *dev, int pid, -+ uint8_t devep, -+ uint8_t *data, int len) ++static int usb_host_handle_data(USBDevice *dev, USBPacket *p) +{ + USBHostDevice *s = (USBHostDevice *)dev; + int ret, fd, mode; + int one = 1, shortpacket = 0, timeout = 50; + sigset_t new_mask, old_mask; ++ uint8_t devep = p->devep; + + /* protect data transfers from SIGALRM signal */ + sigemptyset(&new_mask); + sigaddset(&new_mask, SIGALRM); + sigprocmask(SIG_BLOCK, &new_mask, &old_mask); + -+ /* XXX: optimize and handle all data types by looking at the -+ config descriptor */ -+ if (pid == USB_TOKEN_IN) { ++ if (p->pid == USB_TOKEN_IN) { + devep |= 0x80; + mode = O_RDONLY; + shortpacket = 1; @@ -311,10 +308,10 @@ + } + } + -+ if (pid == USB_TOKEN_IN) -+ ret = read(fd, data, len); ++ if (p->pid == USB_TOKEN_IN) ++ ret = read(fd, p->data, p->len); + else -+ ret = write(fd, data, len); ++ ret = write(fd, p->data, p->len); + + sigprocmask(SIG_SETMASK, &old_mask, NULL); + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612162227.kBGMRJUV024598>