From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47371)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreast@FreeBSD.org>) id 1Vc006-0003Rz-IB
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 17:42:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andreast@FreeBSD.org>) id 1Vc000-0000e1-0k
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 17:41:58 -0400
Received: from mail.fgznet.ch ([81.92.96.47]:60699 helo=smtp.fgznet.ch)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreast@FreeBSD.org>) id 1Vbzzz-0000di-NQ
	for qemu-devel@nongnu.org; Thu, 31 Oct 2013 17:41:51 -0400
Received: from deuterium.andreas.nets (dhclient-91-190-14-19.flashcable.ch
	[91.190.14.19])
	by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id
	r9VLfk66019511
	for <qemu-devel@nongnu.org>; Thu, 31 Oct 2013 22:41:49 +0100 (CET)
	(envelope-from andreast@FreeBSD.org)
Message-ID: <5272CE9A.2080605@FreeBSD.org>
Date: Thu, 31 Oct 2013 22:41:46 +0100
From: Andreas Tobler <andreast@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [patch] Fix FreeBSD compilation block/raw-posix.c
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Hi all,

the below patch is needed to compile qemu trunk on FreeBSD with gcc48,
clang will fail.... ;). Host x84_64-freebsd.

Installation will fail due to hardcoded /usr/bin/python in
scripts/acpi_extract.py

Thanks,
Andreas

Signed-off-by: Andreas Tobler <do-I-put-my-address-here?>

[neon:src/qemu/qemu-master] andreast% git diff block/raw-posix.c
diff --git a/block/raw-posix.c b/block/raw-posix.c
index f6d48bb..6038d7c 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1842,7 +1842,8 @@ static BlockDriver bdrv_host_cdrom = {
 #endif /* __linux__ */

 #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
-static int cdrom_open(BlockDriverState *bs, QDict *options, int flags)
+static int cdrom_open(BlockDriverState *bs, QDict *options, int flags,
+                       Error **errp)
 {
     BDRVRawState *s = bs->opaque;
     Error *local_err = NULL;