[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 2/2] Add proper -errno error return values to qc
From: |
Jes Sorensen |
Subject: |
[Qemu-devel] Re: [PATCH 2/2] Add proper -errno error return values to qcow2_open() |
Date: |
Fri, 17 Dec 2010 15:47:32 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.7 |
On 12/17/10 15:27, Kevin Wolf wrote:
> Am 16.12.2010 17:05, schrieb address@hidden:
>> From: Jes Sorensen <address@hidden>
>>
>> In addition this adds missing braces to the function to be consistent
>> with the coding style.
>>
>> Signed-off-by: Jes Sorensen <address@hidden>
>> ---
>> block/qcow2.c | 61
>> ++++++++++++++++++++++++++++++++++++++++----------------
>> 1 files changed, 43 insertions(+), 18 deletions(-)
>>
>> diff --git a/block/qcow2.c b/block/qcow2.c
>> index d7fd167..b4a9e5e 100644
>> --- a/block/qcow2.c
>> +++ b/block/qcow2.c
>> @@ -140,12 +140,14 @@ static int qcow2_read_extensions(BlockDriverState *bs,
>> uint64_t start_offset,
>> static int qcow2_open(BlockDriverState *bs, int flags)
>> {
>> BDRVQcowState *s = bs->opaque;
>> - int len, i;
>> + int len, i, ret = 0;
>> QCowHeader header;
>> uint64_t ext_end;
>>
>> - if (bdrv_pread(bs->file, 0, &header, sizeof(header)) != sizeof(header))
>> + if (bdrv_pread(bs->file, 0, &header, sizeof(header)) != sizeof(header))
>> {
>> + ret = -EIO;
>> goto fail;
>> + }
>
> ret = bdrv_pread(...);
> if (ret < 0) {
> goto fail;
> }
Hmmm I must have confused something and looked at a wrong pread function
where it just returned -1 on error. I'll fix it.
Thanks,
Jes