diff options
| -rw-r--r-- | block-raw.c | 17 | ||||
| -rw-r--r-- | block.c | 39 |
2 files changed, 40 insertions, 16 deletions
diff --git a/block-raw.c b/block-raw.c index 9fe953c303..1401e82150 100644 --- a/block-raw.c +++ b/block-raw.c @@ -906,13 +906,13 @@ static int raw_open(BlockDriverState *bs, const char *filename, int flags) create_flags = OPEN_EXISTING; } #ifdef QEMU_TOOL - overlapped = 0; + overlapped = FILE_ATTRIBUTE_NORMAL; #else overlapped = FILE_FLAG_OVERLAPPED; #endif s->hfile = CreateFile(filename, access_flags, FILE_SHARE_READ, NULL, - create_flags, overlapped, 0); + create_flags, overlapped, NULL); if (s->hfile == INVALID_HANDLE_VALUE) return -1; return 0; @@ -962,6 +962,7 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset, return ret_count; } +#if 0 #ifndef QEMU_TOOL static void raw_aio_cb(void *opaque) { @@ -1064,10 +1065,12 @@ static void raw_aio_cancel(BlockDriverAIOCB *blockacb) qemu_aio_release(acb); #endif } +#endif /* #if 0 */ static void raw_flush(BlockDriverState *bs) { - /* XXX: add it */ + BDRVRawState *s = bs->opaque; + FlushFileBuffers(s->hfile); } static void raw_close(BlockDriverState *bs) @@ -1143,6 +1146,10 @@ void qemu_aio_flush(void) { } +void qemu_aio_flush(void) +{ +} + void qemu_aio_wait_start(void) { } @@ -1254,13 +1261,13 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags) create_flags = OPEN_EXISTING; #ifdef QEMU_TOOL - overlapped = 0; + overlapped = FILE_ATTRIBUTE_NORMAL; #else overlapped = FILE_FLAG_OVERLAPPED; #endif s->hfile = CreateFile(filename, access_flags, FILE_SHARE_READ, NULL, - create_flags, overlapped, 0); + create_flags, overlapped, NULL); if (s->hfile == INVALID_HANDLE_VALUE) return -1; return 0; @@ -56,12 +56,6 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, static BlockDriverState *bdrv_first; static BlockDriver *first_drv; -#ifdef _WIN32 -#define PATH_SEP '\\' -#else -#define PATH_SEP '/' -#endif - int path_is_absolute(const char *path) { const char *p; @@ -70,7 +64,11 @@ int path_is_absolute(const char *path) p++; else p = path; - return (*p == PATH_SEP); +#ifdef _WIN32 + return (*p == '/' || *p == '\\'); +#else + return (*p == '/'); +#endif } /* if filename is absolute, just copy it to dest. Otherwise, build a @@ -93,7 +91,15 @@ void path_combine(char *dest, int dest_size, p++; else p = base_path; - p1 = strrchr(base_path, PATH_SEP); + p1 = strrchr(base_path, '/'); +#ifdef _WIN32 + { + const char *p2; + p2 = strrchr(base_path, '\\'); + if (!p1 || p2 > p1) + p1 = p2; + } +#endif if (p1) p1++; else @@ -168,7 +174,10 @@ int bdrv_create(BlockDriver *drv, #ifdef _WIN32 void get_tmp_filename(char *filename, int size) { - tmpnam(filename); + char temp_dir[MAX_PATH]; + + GetTempPath(MAX_PATH, temp_dir); + GetTempFileName(temp_dir, "qem", 0, filename); } #else void get_tmp_filename(char *filename, int size) @@ -996,7 +1005,11 @@ char *get_human_readable_size(char *buf, int buf_size, int64_t size) char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) { char buf1[128], date_buf[128], clock_buf[128]; +#ifdef _WIN32 + struct tm *ptm; +#else struct tm tm; +#endif time_t ti; int64_t secs; @@ -1006,11 +1019,15 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); } else { ti = sn->date_sec; -#ifndef _WIN32 +#ifdef _WIN32 + ptm = localtime(&ti); + strftime(date_buf, sizeof(date_buf), + "%Y-%m-%d %H:%M:%S", ptm); +#else localtime_r(&ti, &tm); -#endif strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm); +#endif secs = sn->vm_clock_nsec / 1000000000; snprintf(clock_buf, sizeof(clock_buf), "%02d:%02d:%02d.%03d", |