Diff for /qemu/block-bochs.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2018/04/24 16:45:05 version 1.1.1.3, 2018/04/24 16:47:31
Line 1 Line 1
 /*  /*
  * Block driver for the various disk image formats used by Bochs   * Block driver for the various disk image formats used by Bochs
  * Currently only for "growing" type in read-only mode   * Currently only for "growing" type in read-only mode
  *    *
  * Copyright (c) 2005 Alex Beregszaszi   * Copyright (c) 2005 Alex Beregszaszi
  *    *
  * Permission is hereby granted, free of charge, to any person obtaining a copy   * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal   * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights   * in the Software without restriction, including without limitation the rights
Line 22 Line 22
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.   * THE SOFTWARE.
  */   */
 #include "vl.h"  #include "qemu-common.h"
 #include "block_int.h"  #include "block_int.h"
   
 /**************************************************************/  /**************************************************************/
Line 44  struct bochs_header_v1 { Line 44  struct bochs_header_v1 {
     char subtype[16]; // "Undoable" / "Volatile" / "Growing"      char subtype[16]; // "Undoable" / "Volatile" / "Growing"
     uint32_t version;      uint32_t version;
     uint32_t header; // size of header      uint32_t header; // size of header
       
     union {      union {
         struct {          struct {
             uint32_t catalog; // num of entries              uint32_t catalog; // num of entries
Line 64  struct bochs_header { Line 64  struct bochs_header {
     char subtype[16]; // "Undoable" / "Volatile" / "Growing"      char subtype[16]; // "Undoable" / "Volatile" / "Growing"
     uint32_t version;      uint32_t version;
     uint32_t header; // size of header      uint32_t header; // size of header
       
     union {      union {
         struct {          struct {
             uint32_t catalog; // num of entries              uint32_t catalog; // num of entries
Line 83  typedef struct BDRVBochsState { Line 83  typedef struct BDRVBochsState {
   
     uint32_t *catalog_bitmap;      uint32_t *catalog_bitmap;
     int catalog_size;      int catalog_size;
       
     int data_offset;      int data_offset;
       
     int bitmap_blocks;      int bitmap_blocks;
     int extent_blocks;      int extent_blocks;
     int extent_size;      int extent_size;
Line 94  typedef struct BDRVBochsState { Line 94  typedef struct BDRVBochsState {
 static int bochs_probe(const uint8_t *buf, int buf_size, const char *filename)  static int bochs_probe(const uint8_t *buf, int buf_size, const char *filename)
 {  {
     const struct bochs_header *bochs = (const void *)buf;      const struct bochs_header *bochs = (const void *)buf;
       
     if (buf_size < HEADER_SIZE)      if (buf_size < HEADER_SIZE)
         return 0;          return 0;
   
Line 121  static int bochs_open(BlockDriverState * Line 121  static int bochs_open(BlockDriverState *
         if (fd < 0)          if (fd < 0)
             return -1;              return -1;
     }      }
       
     bs->read_only = 1; // no write support yet      bs->read_only = 1; // no write support yet
       
     s->fd = fd;      s->fd = fd;
   
     if (read(fd, &bochs, sizeof(bochs)) != sizeof(bochs)) {      if (read(fd, &bochs, sizeof(bochs)) != sizeof(bochs)) {
Line 161  static int bochs_open(BlockDriverState * Line 161  static int bochs_open(BlockDriverState *
   
     s->bitmap_blocks = 1 + (le32_to_cpu(bochs.extra.redolog.bitmap) - 1) / 512;      s->bitmap_blocks = 1 + (le32_to_cpu(bochs.extra.redolog.bitmap) - 1) / 512;
     s->extent_blocks = 1 + (le32_to_cpu(bochs.extra.redolog.extent) - 1) / 512;      s->extent_blocks = 1 + (le32_to_cpu(bochs.extra.redolog.extent) - 1) / 512;
       
     s->extent_size = le32_to_cpu(bochs.extra.redolog.extent);      s->extent_size = le32_to_cpu(bochs.extra.redolog.extent);
   
     return 0;      return 0;
Line 180  static inline int seek_to_sector(BlockDr Line 180  static inline int seek_to_sector(BlockDr
     // seek to sector      // seek to sector
     extent_index = offset / s->extent_size;      extent_index = offset / s->extent_size;
     extent_offset = (offset % s->extent_size) / 512;      extent_offset = (offset % s->extent_size) / 512;
       
     if (s->catalog_bitmap[extent_index] == 0xffffffff)      if (s->catalog_bitmap[extent_index] == 0xffffffff)
     {      {
 //      fprintf(stderr, "page not allocated [%x - %x:%x]\n",  //      fprintf(stderr, "page not allocated [%x - %x:%x]\n",
Line 191  static inline int seek_to_sector(BlockDr Line 191  static inline int seek_to_sector(BlockDr
     bitmap_offset = s->data_offset + (512 * s->catalog_bitmap[extent_index] *      bitmap_offset = s->data_offset + (512 * s->catalog_bitmap[extent_index] *
         (s->extent_blocks + s->bitmap_blocks));          (s->extent_blocks + s->bitmap_blocks));
     block_offset = bitmap_offset + (512 * (s->bitmap_blocks + extent_offset));      block_offset = bitmap_offset + (512 * (s->bitmap_blocks + extent_offset));
       
 //    fprintf(stderr, "sect: %x [ext i: %x o: %x] -> %x bitmap: %x block: %x\n",  //    fprintf(stderr, "sect: %x [ext i: %x o: %x] -> %x bitmap: %x block: %x\n",
 //      sector_num, extent_index, extent_offset,  //      sector_num, extent_index, extent_offset,
 //      le32_to_cpu(s->catalog_bitmap[extent_index]),  //      le32_to_cpu(s->catalog_bitmap[extent_index]),
 //      bitmap_offset, block_offset);  //      bitmap_offset, block_offset);
       
     // read in bitmap for current extent      // read in bitmap for current extent
     lseek(s->fd, bitmap_offset + (extent_offset / 8), SEEK_SET);      lseek(s->fd, bitmap_offset + (extent_offset / 8), SEEK_SET);
       
     read(s->fd, &bitmap_entry, 1);      read(s->fd, &bitmap_entry, 1);
       
     if (!((bitmap_entry >> (extent_offset % 8)) & 1))      if (!((bitmap_entry >> (extent_offset % 8)) & 1))
     {      {
 //      fprintf(stderr, "sector (%x) in bitmap not allocated\n",  //      fprintf(stderr, "sector (%x) in bitmap not allocated\n",
Line 210  static inline int seek_to_sector(BlockDr Line 210  static inline int seek_to_sector(BlockDr
     }      }
   
     lseek(s->fd, block_offset, SEEK_SET);      lseek(s->fd, block_offset, SEEK_SET);
       
     return 0;      return 0;
 }  }
   
 static int bochs_read(BlockDriverState *bs, int64_t sector_num,   static int bochs_read(BlockDriverState *bs, int64_t sector_num,
                     uint8_t *buf, int nb_sectors)                      uint8_t *buf, int nb_sectors)
 {  {
     BDRVBochsState *s = bs->opaque;      BDRVBochsState *s = bs->opaque;

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


unix.superglobalmegacorp.com