Skip to contentSkip to conversation

Fix FreeBSD compilation block/raw-posix.c

PATCH Applied Andreas Tobler 2 participants 2 messages Oct 31, 2013 – Nov 4, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix FreeBSD compilation block/raw-posix.c

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

block/raw-posix.c +2 -1
index f6d48bb..6038d7c 100644
@@ -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 lore raw
Quoted 5 lines · Andreas Tobler

Hi all,

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

Quoted 8 lines

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