From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePOi-0005QU-Mt for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:13:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VePOc-00060c-Fn for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:13:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePOc-00060S-3k for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:13:14 -0500 From: Stefan Hajnoczi Date: Thu, 7 Nov 2013 14:12:11 +0100 Message-Id: <1383829964-32364-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1383829964-32364-1-git-send-email-stefanha@redhat.com> References: <1383829964-32364-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 03/36] block/raw-posix: fix FreeBSD compilation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Andreas Tobler , Anthony Liguori From: Andreas Tobler The below patch is needed to compile qemu trunk on FreeBSD with gcc48, clang will fail.... ;). Host x84_64-freebsd. Signed-off-by: Andreas Tobler Signed-off-by: Stefan Hajnoczi --- block/raw-posix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index f6d48bb..ace5d96 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; -- 1.8.3.1