Revision 3b46e624 block-vpc.c

b/block-vpc.c
65 65

  
66 66
typedef struct BDRVVPCState {
67 67
    int fd;
68
   
68

  
69 69
    int pagetable_entries;
70 70
    uint32_t *pagetable;
71 71

  
......
74 74
    uint8_t *pageentry_u8;
75 75
    uint32_t *pageentry_u32;
76 76
    uint16_t *pageentry_u16;
77
   
77

  
78 78
    uint64_t last_bitmap;
79 79
#endif
80 80
} BDRVVPCState;
......
97 97
        return -1;
98 98

  
99 99
    bs->read_only = 1; // no write support yet
100
   
100

  
101 101
    s->fd = fd;
102 102

  
103 103
    if (read(fd, &header, HEADER_SIZE) != HEADER_SIZE)
......
153 153

  
154 154
    pagetable_index = offset / s->pageentry_size;
155 155
    pageentry_index = (offset % s->pageentry_size) / 512;
156
   
156

  
157 157
    if (pagetable_index > s->pagetable_entries || s->pagetable[pagetable_index] == 0xffffffff)
158 158
	return -1; // not allocated
159 159

  
160 160
    bitmap_offset = 512 * s->pagetable[pagetable_index];
161 161
    block_offset = bitmap_offset + 512 + (512 * pageentry_index);
162
   
162

  
163 163
//    printf("sector: %" PRIx64 ", index: %x, offset: %x, bioff: %" PRIx64 ", bloff: %" PRIx64 "\n",
164 164
//	sector_num, pagetable_index, pageentry_index,
165 165
//	bitmap_offset, block_offset);

Also available in: Unified diff