david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

64 bit file I/O by default

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1040 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-08-03 21:14:23 +00:00
parent 11c0315f9b
commit d5249393ef
7 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ CFLAGS+=-fpack-struct
endif endif
LDFLAGS=-g LDFLAGS=-g
LIBS= LIBS=
DEFINES+=-D_GNU_SOURCE DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
TOOLS=qemu-img TOOLS=qemu-img
ifdef CONFIG_STATIC ifdef CONFIG_STATIC
LDFLAGS+=-static LDFLAGS+=-static

2
Makefile.target
View File

@ -159,7 +159,7 @@ endif
######################################################### #########################################################
DEFINES+=-D_GNU_SOURCE DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
LIBS+=-lm LIBS+=-lm
ifndef CONFIG_USER_ONLY ifndef CONFIG_USER_ONLY
LIBS+=-lz LIBS+=-lz

4
block-cow.c
View File

@ -173,7 +173,7 @@ static int cow_read(BlockDriverState *bs, int64_t sector_num,
while (nb_sectors > 0) { while (nb_sectors > 0) {
if (is_changed(s->cow_bitmap, sector_num, nb_sectors, &n)) { if (is_changed(s->cow_bitmap, sector_num, nb_sectors, &n)) {
lseek64(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET); lseek(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET);
ret = read(s->fd, buf, n * 512); ret = read(s->fd, buf, n * 512);
if (ret != n * 512) if (ret != n * 512)
return -1; return -1;
@ -193,7 +193,7 @@ static int cow_write(BlockDriverState *bs, int64_t sector_num,
BDRVCowState *s = bs->opaque; BDRVCowState *s = bs->opaque;
int ret, i; int ret, i;
lseek64(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET); lseek(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET);
ret = write(s->fd, buf, nb_sectors * 512); ret = write(s->fd, buf, nb_sectors * 512);
if (ret != nb_sectors * 512) if (ret != nb_sectors * 512)
return -1; return -1;

26
block-qcow.c
View File

@ -137,7 +137,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename)
s->l1_table = qemu_malloc(s->l1_size * sizeof(uint64_t)); s->l1_table = qemu_malloc(s->l1_size * sizeof(uint64_t));
if (!s->l1_table) if (!s->l1_table)
goto fail; goto fail;
lseek64(fd, s->l1_table_offset, SEEK_SET); lseek(fd, s->l1_table_offset, SEEK_SET);
if (read(fd, s->l1_table, s->l1_size * sizeof(uint64_t)) != if (read(fd, s->l1_table, s->l1_size * sizeof(uint64_t)) !=
s->l1_size * sizeof(uint64_t)) s->l1_size * sizeof(uint64_t))
goto fail; goto fail;
@ -161,7 +161,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename)
len = header.backing_file_size; len = header.backing_file_size;
if (len > 1023) if (len > 1023)
len = 1023; len = 1023;
lseek64(fd, header.backing_file_offset, SEEK_SET); lseek(fd, header.backing_file_offset, SEEK_SET);
if (read(fd, bs->backing_file, len) != len) if (read(fd, bs->backing_file, len) != len)
goto fail; goto fail;
bs->backing_file[len] = '\0'; bs->backing_file[len] = '\0';
@ -275,13 +275,13 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,
if (!allocate) if (!allocate)
return 0; return 0;
/* allocate a new l2 entry */ /* allocate a new l2 entry */
l2_offset = lseek64(s->fd, 0, SEEK_END); l2_offset = lseek(s->fd, 0, SEEK_END);
/* round to cluster size */ /* round to cluster size */
l2_offset = (l2_offset + s->cluster_size - 1) & ~(s->cluster_size - 1); l2_offset = (l2_offset + s->cluster_size - 1) & ~(s->cluster_size - 1);
/* update the L1 entry */ /* update the L1 entry */
s->l1_table[l1_index] = l2_offset; s->l1_table[l1_index] = l2_offset;
tmp = cpu_to_be64(l2_offset); tmp = cpu_to_be64(l2_offset);
lseek64(s->fd, s->l1_table_offset + l1_index * sizeof(tmp), SEEK_SET); lseek(s->fd, s->l1_table_offset + l1_index * sizeof(tmp), SEEK_SET);
if (write(s->fd, &tmp, sizeof(tmp)) != sizeof(tmp)) if (write(s->fd, &tmp, sizeof(tmp)) != sizeof(tmp))
return 0; return 0;
new_l2_table = 1; new_l2_table = 1;
@ -336,16 +336,16 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,
overwritten */ overwritten */
if (decompress_cluster(s, cluster_offset) < 0) if (decompress_cluster(s, cluster_offset) < 0)
return 0; return 0;
cluster_offset = lseek64(s->fd, 0, SEEK_END); cluster_offset = lseek(s->fd, 0, SEEK_END);
cluster_offset = (cluster_offset + s->cluster_size - 1) & cluster_offset = (cluster_offset + s->cluster_size - 1) &
~(s->cluster_size - 1); ~(s->cluster_size - 1);
/* write the cluster content */ /* write the cluster content */
lseek64(s->fd, cluster_offset, SEEK_SET); lseek(s->fd, cluster_offset, SEEK_SET);
if (write(s->fd, s->cluster_cache, s->cluster_size) != if (write(s->fd, s->cluster_cache, s->cluster_size) !=
s->cluster_size) s->cluster_size)
return -1; return -1;
} else { } else {
cluster_offset = lseek64(s->fd, 0, SEEK_END); cluster_offset = lseek(s->fd, 0, SEEK_END);
if (allocate == 1) { if (allocate == 1) {
/* round to cluster size */ /* round to cluster size */
cluster_offset = (cluster_offset + s->cluster_size - 1) & cluster_offset = (cluster_offset + s->cluster_size - 1) &
@ -364,7 +364,7 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,
s->cluster_data, s->cluster_data,
s->cluster_data + 512, 1, 1, s->cluster_data + 512, 1, 1,
&s->aes_encrypt_key); &s->aes_encrypt_key);
lseek64(s->fd, cluster_offset + i * 512, SEEK_SET); lseek(s->fd, cluster_offset + i * 512, SEEK_SET);
if (write(s->fd, s->cluster_data, 512) != 512) if (write(s->fd, s->cluster_data, 512) != 512)
return -1; return -1;
} }
@ -378,7 +378,7 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,
/* update L2 table */ /* update L2 table */
tmp = cpu_to_be64(cluster_offset); tmp = cpu_to_be64(cluster_offset);
l2_table[l2_index] = tmp; l2_table[l2_index] = tmp;
lseek64(s->fd, l2_offset + l2_index * sizeof(tmp), SEEK_SET); lseek(s->fd, l2_offset + l2_index * sizeof(tmp), SEEK_SET);
if (write(s->fd, &tmp, sizeof(tmp)) != sizeof(tmp)) if (write(s->fd, &tmp, sizeof(tmp)) != sizeof(tmp))
return 0; return 0;
} }
@ -437,7 +437,7 @@ static int decompress_cluster(BDRVQcowState *s, uint64_t cluster_offset)
if (s->cluster_cache_offset != coffset) { if (s->cluster_cache_offset != coffset) {
csize = cluster_offset >> (63 - s->cluster_bits); csize = cluster_offset >> (63 - s->cluster_bits);
csize &= (s->cluster_size - 1); csize &= (s->cluster_size - 1);
lseek64(s->fd, coffset, SEEK_SET); lseek(s->fd, coffset, SEEK_SET);
ret = read(s->fd, s->cluster_data, csize); ret = read(s->fd, s->cluster_data, csize);
if (ret != csize) if (ret != csize)
return -1; return -1;
@ -470,7 +470,7 @@ static int qcow_read(BlockDriverState *bs, int64_t sector_num,
return -1; return -1;
memcpy(buf, s->cluster_cache + index_in_cluster * 512, 512 * n); memcpy(buf, s->cluster_cache + index_in_cluster * 512, 512 * n);
} else { } else {
lseek64(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET); lseek(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET);
ret = read(s->fd, buf, n * 512); ret = read(s->fd, buf, n * 512);
if (ret != n * 512) if (ret != n * 512)
return -1; return -1;
@ -503,7 +503,7 @@ static int qcow_write(BlockDriverState *bs, int64_t sector_num,
index_in_cluster + n); index_in_cluster + n);
if (!cluster_offset) if (!cluster_offset)
return -1; return -1;
lseek64(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET); lseek(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET);
if (s->crypt_method) { if (s->crypt_method) {
encrypt_sectors(s, sector_num, s->cluster_data, buf, n, 1, encrypt_sectors(s, sector_num, s->cluster_data, buf, n, 1,
&s->aes_encrypt_key); &s->aes_encrypt_key);
@ -650,7 +650,7 @@ int qcow_compress_cluster(BlockDriverState *bs, int64_t sector_num,
cluster_offset = get_cluster_offset(bs, sector_num << 9, 2, cluster_offset = get_cluster_offset(bs, sector_num << 9, 2,
out_len, 0, 0); out_len, 0, 0);
cluster_offset &= s->cluster_offset_mask; cluster_offset &= s->cluster_offset_mask;
lseek64(s->fd, cluster_offset, SEEK_SET); lseek(s->fd, cluster_offset, SEEK_SET);
if (write(s->fd, out_buf, out_len) != out_len) { if (write(s->fd, out_buf, out_len) != out_len) {
qemu_free(out_buf); qemu_free(out_buf);
return -1; return -1;

2
block-vmdk.c
View File

@ -239,7 +239,7 @@ static int vmdk_read(BlockDriverState *bs, int64_t sector_num,
if (!cluster_offset) { if (!cluster_offset) {
memset(buf, 0, 512 * n); memset(buf, 0, 512 * n);
} else { } else {
lseek64(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET); lseek(s->fd, cluster_offset + index_in_cluster * 512, SEEK_SET);
ret = read(s->fd, buf, n * 512); ret = read(s->fd, buf, n * 512);
if (ret != n * 512) if (ret != n * 512)
return -1; return -1;

18
block.c
View File

@ -71,14 +71,22 @@ int bdrv_create(BlockDriver *drv,
return drv->bdrv_create(filename, size_in_sectors, backing_file, flags); return drv->bdrv_create(filename, size_in_sectors, backing_file, flags);
} }
/* XXX: race condition possible */ #ifdef _WIN32
static void get_tmp_filename(char *filename, int size)
{
/* XXX: find a better function */
tmpnam(filename);
}
#else
static void get_tmp_filename(char *filename, int size) static void get_tmp_filename(char *filename, int size)
{ {
int fd; int fd;
/* XXX: race condition possible */
pstrcpy(filename, size, "/tmp/vl.XXXXXX"); pstrcpy(filename, size, "/tmp/vl.XXXXXX");
fd = mkstemp(filename); fd = mkstemp(filename);
close(fd); close(fd);
} }
#endif
static BlockDriver *find_image_format(const char *filename) static BlockDriver *find_image_format(const char *filename)
{ {
@ -514,7 +522,7 @@ static int raw_open(BlockDriverState *bs, const char *filename)
return -1; return -1;
bs->read_only = 1; bs->read_only = 1;
} }
size = lseek64(fd, 0, SEEK_END); size = lseek(fd, 0, SEEK_END);
bs->total_sectors = size / 512; bs->total_sectors = size / 512;
s->fd = fd; s->fd = fd;
return 0; return 0;
@ -526,7 +534,7 @@ static int raw_read(BlockDriverState *bs, int64_t sector_num,
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int ret; int ret;
lseek64(s->fd, sector_num * 512, SEEK_SET); lseek(s->fd, sector_num * 512, SEEK_SET);
ret = read(s->fd, buf, nb_sectors * 512); ret = read(s->fd, buf, nb_sectors * 512);
if (ret != nb_sectors * 512) if (ret != nb_sectors * 512)
return -1; return -1;
@ -539,7 +547,7 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num,
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int ret; int ret;
lseek64(s->fd, sector_num * 512, SEEK_SET); lseek(s->fd, sector_num * 512, SEEK_SET);
ret = write(s->fd, buf, nb_sectors * 512); ret = write(s->fd, buf, nb_sectors * 512);
if (ret != nb_sectors * 512) if (ret != nb_sectors * 512)
return -1; return -1;
@ -564,7 +572,7 @@ static int raw_create(const char *filename, int64_t total_size,
0644); 0644);
if (fd < 0) if (fd < 0)
return -EIO; return -EIO;
ftruncate64(fd, total_size * 512); ftruncate(fd, total_size * 512);
close(fd); close(fd);
return 0; return 0;
} }

4
configure vendored
View File

@ -429,10 +429,6 @@ echo "TARGET_DIRS=$target_list" >> $config_mak
# XXX: suppress that # XXX: suppress that
if [ "$bsd" = "yes" ] ; then if [ "$bsd" = "yes" ] ; then
echo "#define O_LARGEFILE 0" >> $config_h echo "#define O_LARGEFILE 0" >> $config_h
echo "#define lseek64 lseek" >> $config_h
echo "#define mkstemp64 mkstemp" >> $config_h
echo "#define ftruncate64 ftruncate" >> $config_h
echo "#define off64_t off_t" >> $config_h
echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
echo "#define _BSD 1" >> $config_h echo "#define _BSD 1" >> $config_h
fi fi