Re: [Qemu-devel] [patch] Fix FreeBSD compilation block/raw-posix.c

[Stefan Hajnoczi]

On Thu, Oct 31, 2013 at 10:41:46PM +0100, Andreas Tobler wrote:
 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?
 

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[Qemu-devel] [patch] Fix FreeBSD compilation block/raw-posix.c

[Andreas Tobler]

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;