64 bit fixes (Falk Hueffner)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@365 c046a42c-6fe2-441c-8c8c-71466251a162
master
bellard 2003-08-11 20:35:58 +00:00
parent 9da8ba18e6
commit 9dfa5b421d
2 changed files with 2 additions and 2 deletions

View File

@ -152,7 +152,7 @@ void target_to_host_sigset(sigset_t *d, const target_sigset_t *s)
((unsigned long *)d)[i] = tswapl(s->sig[i]); ((unsigned long *)d)[i] = tswapl(s->sig[i]);
} }
#elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2 #elif TARGET_LONG_BITS == 32 && HOST_LONG_BITS == 64 && TARGET_NSIG_WORDS == 2
((unsigned long *)d)[0] = sigmask | (tswapl(s->sig[1]) << 32); ((unsigned long *)d)[0] = sigmask | ((unsigned long)tswapl(s->sig[1]) << 32);
#else #else
#error target_to_host_sigset #error target_to_host_sigset
#endif /* TARGET_LONG_BITS */ #endif /* TARGET_LONG_BITS */

2
vl.h
View File

@ -60,7 +60,7 @@ int bdrv_commit(BlockDriverState *bs);
struct cow_header_v2 { struct cow_header_v2 {
uint32_t magic; uint32_t magic;
uint32_t long version; uint32_t version;
char backing_file[1024]; char backing_file[1024];
int32_t mtime; int32_t mtime;
uint64_t size; uint64_t size;