ide: move ide_sect_range_ok() up
to use it without a forward declaration in the commit to follow Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com> Message-id: 1512735034-35327-3-git-send-email-anton.nefedov@virtuozzo.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
		
							parent
							
								
									ef0e64a983
								
							
						
					
					
						commit
						d8b070fed2
					
				@ -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 {
 | 
					typedef struct TrimAIOCB {
 | 
				
			||||||
    BlockAIOCB common;
 | 
					    BlockAIOCB common;
 | 
				
			||||||
    IDEState *s;
 | 
					    IDEState *s;
 | 
				
			||||||
@ -603,18 +615,6 @@ static void ide_rw_error(IDEState *s) {
 | 
				
			|||||||
    ide_set_irq(s->bus);
 | 
					    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)
 | 
					static void ide_buffered_readv_cb(void *opaque, int ret)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    IDEBufferedRequest *req = opaque;
 | 
					    IDEBufferedRequest *req = opaque;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user