Re: [Qemu-devel] buildbot failure in qemu on block_x86_64_debian_6_0

[Kevin Wolf]

Am 24.01.2012 07:53, schrieb Andreas Färber:
> Am 24.01.2012 04:12, schrieb address@hidden:
>> The Buildbot has detected a new failure on builder block_x86_64_debian_6_0 
>> while building qemu.
>> Full details are available at:
>>  
>> http://buildbot.b1-systems.de/qemu/builders/block_x86_64_debian_6_0/builds/162
>>
>> Buildbot URL: http://buildbot.b1-systems.de/qemu/
>>
>> Buildslave for this Build: yuzuki
>>
>> Build Reason: The Nightly scheduler named 'nightly_block' triggered this 
>> build
>> Build Source Stamp: [branch block] HEAD
>> Blamelist: 
>>
>> BUILD FAILED: failed compile
> 
> Log says:
> 
>   CC    blockdev.o
> cc1: warnings being treated as errors
> blockdev.c: In function 'eject_device':
> blockdev.c:715: error: 'return' with a value, in function returning void
> make[1]: Leaving directory `/home/build/qemu/block_x86_64_debian_6_0/build'
> make[1]: *** [blockdev.o] Error 1

Stefan, this seems to be a merge conflict for your patch "block: check
bdrv_in_use() before blockdev operations". I'll apply this fix to the patch:

diff --git a/blockdev.c b/blockdev.c
index 9252c25..0499ee6 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -678,8 +678,8 @@ void qmp_blockdev_snapshot_sync(const char *device,
const char *snapshot_file,
 static void eject_device(BlockDriverState *bs, int force, Error **errp)
 {
     if (bdrv_in_use(bs)) {
-        qerror_report(QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
-        return -1;
+        error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
+        return;
     }
     if (!bdrv_dev_has_removable_media(bs)) {
         error_set(errp, QERR_DEVICE_NOT_REMOVABLE,
bdrv_get_device_name(bs));

Kevin