Commit d8b070fe authored by Anton Nefedov's avatar Anton Nefedov Committed by John Snow
Browse files

ide: move ide_sect_range_ok() up 



to use it without a forward declaration in the commit to follow

Signed-off-by: default avatarAnton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 1512735034-35327-3-git-send-email-anton.nefedov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent ef0e64a9

hw/ide/core.c

+12 −12
Original line number Diff line number Diff line
@@ -380,6 +380,18 @@ static void ide_set_signature(IDEState *s) 
    }

}



static bool ide_sect_range_ok(IDEState *s,

                              uint64_t sector, uint64_t nb_sectors)

{

    uint64_t total_sectors;



    blk_get_geometry(s->blk, &total_sectors);

    if (sector > total_sectors || nb_sectors > total_sectors - sector) {

        return false;

    }

    return true;

}



typedef struct TrimAIOCB {

    BlockAIOCB common;

    IDEState *s;
@@ -603,18 +615,6 @@ static void ide_rw_error(IDEState *s) { 
    ide_set_irq(s->bus);

}



static bool ide_sect_range_ok(IDEState *s,

                              uint64_t sector, uint64_t nb_sectors)

{

    uint64_t total_sectors;



    blk_get_geometry(s->blk, &total_sectors);

    if (sector > total_sectors || nb_sectors > total_sectors - sector) {

        return false;

    }

    return true;

}



static void ide_buffered_readv_cb(void *opaque, int ret)

{

    IDEBufferedRequest *req = opaque;