Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Dec 2006 20:26:14 +0100 (CET)
From:      Juergen Lock <nox@jelal.kn-bremen.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/106727: update emulators/qemu to 20061214 snapshot, fix physical device access
Message-ID:  <200612141926.kBEJQE4j021359@saturn.kn-bremen.de>
Resent-Message-ID: <200612141930.kBEJUbLY018895@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106727
>Category:       ports
>Synopsis:       update emulators/qemu to 20061214 snapshot, fix physical device access
>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:   Thu Dec 14 19:30:35 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 qemu to today's snapshot
	- fix physical device access

>How-To-Repeat:
	n/a
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile	29 Nov 2006 20:58:35 -0000	1.60
+++ Makefile	14 Dec 2006 18:59:03 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.8.2s.20061128
+PORTVERSION=	0.8.2s.20061214
 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-11-28_05
+DISTNAME=	${PORTNAME}-snapshot-2006-12-14_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.35
diff -u -r1.35 distinfo
--- distinfo	29 Nov 2006 20:58:35 -0000	1.35
+++ distinfo	14 Dec 2006 18:59:53 -0000
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 14dfd81c651af3982125c33f19f7a49a
-SHA256 (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = e31744fd00096a41aabc3dc8d2f1f989cfd11f4c4ffa155a1f91f8c5ae244dfe
-SIZE (qemu/qemu-snapshot-2006-11-28_05.tar.bz2) = 1495656
+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/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
 SIZE (qemu/patch3_cirrus) = 8817
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/pkg-message,v
retrieving revision 1.17
diff -u -r1.17 pkg-message
--- pkg-message	29 Nov 2006 20:58:35 -0000	1.17
+++ pkg-message	14 Dec 2006 18:58:39 -0000
@@ -63,14 +63,6 @@
 CDROM_DMA disabled to disable it.
 - if you build qemu wihout SDL and then get crashes running it try
 passing it -nographic.  This should probably be default in that case...
-- physical device access (real cdrom/dvd instead of iso) seems to cause
-problems with some guests now.  If this happens to you you can make
-an iso of the disc by doing something like
-	dd bs=2k </dev/acd0 >cd.iso
-and then use
-	qemu -cdrom cd.iso ...
-instead of giving it the physical device.  (This might also speed up the
-guest somewhat.)
 - qemu now uses aio at least for ide dma, so if you get `Bad system call'
 crashes that is because aio is not (kld)loaded.
 ====
Index: files/patch-block-raw.c
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/files/patch-block-raw.c,v
retrieving revision 1.1
diff -u -r1.1 patch-block-raw.c
--- files/patch-block-raw.c	4 Nov 2006 18:29:35 -0000	1.1
+++ files/patch-block-raw.c	14 Dec 2006 18:35:04 -0000
@@ -1,4 +1,14 @@
 Index: qemu/block-raw.c
+@@ -51,6 +51,9 @@
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+ #endif
++#ifdef __FreeBSD__
++#include <sys/disk.h>
++#endif
+ 
+ //#define DEBUG_FLOPPY
+ 
 @@ -164,9 +164,20 @@
  static int aio_sig_num = SIGUSR2;
  static RawAIOCB *first_aio; /* AIO issued */
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612141926.kBEJQE4j021359>