[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/11] ds1225y: Use stdio instead of QEMUFile
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 01/11] ds1225y: Use stdio instead of QEMUFile |
Date: |
Fri, 23 Sep 2011 14:50:37 +0200 |
QEMUFile * is only intended for migration nowadays. Using it for
anything else just adds pain and a layer of buffers for no good
reason.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ds1225y.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/hw/ds1225y.c b/hw/ds1225y.c
index 9875c44..6852a61 100644
--- a/hw/ds1225y.c
+++ b/hw/ds1225y.c
@@ -29,7 +29,7 @@ typedef struct {
DeviceState qdev;
uint32_t chip_size;
char *filename;
- QEMUFile *file;
+ FILE *file;
uint8_t *contents;
} NvRamState;
@@ -70,9 +70,9 @@ static void nvram_writeb (void *opaque, target_phys_addr_t
addr, uint32_t val)
s->contents[addr] = val;
if (s->file) {
- qemu_fseek(s->file, addr, SEEK_SET);
- qemu_put_byte(s->file, (int)val);
- qemu_fflush(s->file);
+ fseek(s->file, addr, SEEK_SET);
+ fputc(val, s->file);
+ fflush(s->file);
}
}
@@ -108,15 +108,17 @@ static int nvram_post_load(void *opaque, int version_id)
/* Close file, as filename may has changed in load/store process */
if (s->file) {
- qemu_fclose(s->file);
+ fclose(s->file);
}
/* Write back nvram contents */
- s->file = qemu_fopen(s->filename, "wb");
+ s->file = fopen(s->filename, "wb");
if (s->file) {
/* Write back contents, as 'wb' mode cleaned the file */
- qemu_put_buffer(s->file, s->contents, s->chip_size);
- qemu_fflush(s->file);
+ if (fwrite(s->contents, s->chip_size, 1, s->file) != 1) {
+ printf("nvram_post_load: short write\n");
+ }
+ fflush(s->file);
}
return 0;
@@ -143,7 +145,7 @@ typedef struct {
static int nvram_sysbus_initfn(SysBusDevice *dev)
{
NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram;
- QEMUFile *file;
+ FILE *file;
int s_io;
s->contents = g_malloc0(s->chip_size);
@@ -153,11 +155,13 @@ static int nvram_sysbus_initfn(SysBusDevice *dev)
sysbus_init_mmio(dev, s->chip_size, s_io);
/* Read current file */
- file = qemu_fopen(s->filename, "rb");
+ file = fopen(s->filename, "rb");
if (file) {
/* Read nvram contents */
- qemu_get_buffer(file, s->contents, s->chip_size);
- qemu_fclose(file);
+ if (fread(s->contents, s->chip_size, 1, file) != 1) {
+ printf("nvram_sysbus_initfn: short read\n");
+ }
+ fclose(file);
}
nvram_post_load(s, 0);
--
1.7.6.2
- [Qemu-devel] [PATCH v2 00/11] Handle errors during migration, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 01/11] ds1225y: Use stdio instead of QEMUFile,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/11] migration: simplify state assignmente, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 06/11] migration: If there is one error, it makes no sense to continue, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 04/11] migration: return real error code, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 03/11] migration: Check that migration is active before cancel it, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 07/11] buffered_file: Use right "opaque", Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 09/11] migration: don't "write" when migration is not active, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 10/11] migration: set error if select return one error, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 08/11] buffered_file: reuse QEMUFile has_error field, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 05/11] migration: add error handling to migrate_fd_put_notify()., Juan Quintela, 2011/09/23