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

vmstate: port fdc device

Browse Source 
We can't move fifo back to an embeded array because it needs to be aligned

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-10 03:04:37 +02:00 committed by Anthony Liguori
parent 80cd83e7b2
commit d7a6c27035
1 changed files with 63 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
hw/fdc.c
View File

@ -481,6 +481,7 @@ struct fdctrl_t {
uint8_t sra; uint8_t sra;
uint8_t srb; uint8_t srb;
uint8_t dor; uint8_t dor;
uint8_t dor_vmstate; /* only used as temp during vmstate */
uint8_t tdr; uint8_t tdr;
uint8_t dsr; uint8_t dsr;
uint8_t msr; uint8_t msr;
@ -490,6 +491,7 @@ struct fdctrl_t {
uint8_t status2; uint8_t status2;
/* Command FIFO */ /* Command FIFO */
uint8_t *fifo; uint8_t *fifo;
int32_t fifo_size;
uint32_t data_pos; uint32_t data_pos;
uint32_t data_len; uint32_t data_len;
uint8_t data_state; uint8_t data_state;
@ -508,6 +510,7 @@ struct fdctrl_t {
/* Sun4m quirks? */ /* Sun4m quirks? */
int sun4m; int sun4m;
/* Floppy drives */ /* Floppy drives */
uint8_t num_floppies;
fdrive_t drives[MAX_FD]; fdrive_t drives[MAX_FD];
int reset_sensei; int reset_sensei;
}; };
@ -627,108 +630,73 @@ static CPUWriteMemoryFunc * const fdctrl_mem_write_strict[3] = {
NULL, NULL,
}; };
static void fd_save (QEMUFile *f, fdrive_t *fd) static const VMStateDescription vmstate_fdrive = {
.name = "fdrive",
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
.fields = (VMStateField []) {
VMSTATE_UINT8(head, fdrive_t),
VMSTATE_UINT8(track, fdrive_t),
VMSTATE_UINT8(sect, fdrive_t),
VMSTATE_END_OF_LIST()
}
};
static void fdc_pre_save(const void *opaque)
{ {
qemu_put_8s(f, &fd->head); fdctrl_t *s = (void *)opaque;
qemu_put_8s(f, &fd->track);
qemu_put_8s(f, &fd->sect); s->dor_vmstate = s->dor | GET_CUR_DRV(s);
} }
static void fdc_save (QEMUFile *f, void *opaque) static int fdc_post_load(void *opaque)
{ {
fdctrl_t *s = opaque; fdctrl_t *s = opaque;
uint8_t tmp;
int i;
uint8_t dor = s->dor | GET_CUR_DRV(s);
/* Controller state */
qemu_put_8s(f, &s->sra);
qemu_put_8s(f, &s->srb);
qemu_put_8s(f, &dor);
qemu_put_8s(f, &s->tdr);
qemu_put_8s(f, &s->dsr);
qemu_put_8s(f, &s->msr);
qemu_put_8s(f, &s->status0);
qemu_put_8s(f, &s->status1);
qemu_put_8s(f, &s->status2);
/* Command FIFO */
qemu_put_buffer(f, s->fifo, FD_SECTOR_LEN);
qemu_put_be32s(f, &s->data_pos);
qemu_put_be32s(f, &s->data_len);
qemu_put_8s(f, &s->data_state);
qemu_put_8s(f, &s->data_dir);
qemu_put_8s(f, &s->eot);
/* States kept only to be returned back */
qemu_put_8s(f, &s->timer0);
qemu_put_8s(f, &s->timer1);
qemu_put_8s(f, &s->precomp_trk);
qemu_put_8s(f, &s->config);
qemu_put_8s(f, &s->lock);
qemu_put_8s(f, &s->pwrd);
tmp = MAX_FD;
qemu_put_8s(f, &tmp);
for (i = 0; i < MAX_FD; i++)
fd_save(f, &s->drives[i]);
}
static int fd_load (QEMUFile *f, fdrive_t *fd)
{
qemu_get_8s(f, &fd->head);
qemu_get_8s(f, &fd->track);
qemu_get_8s(f, &fd->sect);
SET_CUR_DRV(s, s->dor_vmstate & FD_DOR_SELMASK);
s->dor = s->dor_vmstate & ~FD_DOR_SELMASK;
return 0; return 0;
} }
static int fdc_load (QEMUFile *f, void *opaque, int version_id) static const VMStateDescription vmstate_fdc = {
{ .name = "fdc",
fdctrl_t *s = opaque; .version_id = 2,
int i, ret = 0; .minimum_version_id = 2,
uint8_t n; .minimum_version_id_old = 2,
.pre_save = fdc_pre_save,
if (version_id != 2) .post_load = fdc_post_load,
return -EINVAL; .fields = (VMStateField []) {
/* Controller State */
/* Controller state */ VMSTATE_UINT8(sra, fdctrl_t),
qemu_get_8s(f, &s->sra); VMSTATE_UINT8(srb, fdctrl_t),
qemu_get_8s(f, &s->srb); VMSTATE_UINT8(dor_vmstate, fdctrl_t),
qemu_get_8s(f, &s->dor); VMSTATE_UINT8(tdr, fdctrl_t),
SET_CUR_DRV(s, s->dor & FD_DOR_SELMASK); VMSTATE_UINT8(dsr, fdctrl_t),
s->dor &= ~FD_DOR_SELMASK; VMSTATE_UINT8(msr, fdctrl_t),
qemu_get_8s(f, &s->tdr); VMSTATE_UINT8(status0, fdctrl_t),
qemu_get_8s(f, &s->dsr); VMSTATE_UINT8(status1, fdctrl_t),
qemu_get_8s(f, &s->msr); VMSTATE_UINT8(status2, fdctrl_t),
qemu_get_8s(f, &s->status0); /* Command FIFO */
qemu_get_8s(f, &s->status1); VMSTATE_VARRAY(fifo, fdctrl_t, fifo_size, 0, vmstate_info_uint8, uint8),
qemu_get_8s(f, &s->status2); VMSTATE_UINT32(data_pos, fdctrl_t),
/* Command FIFO */ VMSTATE_UINT32(data_len, fdctrl_t),
qemu_get_buffer(f, s->fifo, FD_SECTOR_LEN); VMSTATE_UINT8(data_state, fdctrl_t),
qemu_get_be32s(f, &s->data_pos); VMSTATE_UINT8(data_dir, fdctrl_t),
qemu_get_be32s(f, &s->data_len); VMSTATE_UINT8(eot, fdctrl_t),
qemu_get_8s(f, &s->data_state); /* States kept only to be returned back */
qemu_get_8s(f, &s->data_dir); VMSTATE_UINT8(timer0, fdctrl_t),
qemu_get_8s(f, &s->eot); VMSTATE_UINT8(timer1, fdctrl_t),
/* States kept only to be returned back */ VMSTATE_UINT8(precomp_trk, fdctrl_t),
qemu_get_8s(f, &s->timer0); VMSTATE_UINT8(config, fdctrl_t),
qemu_get_8s(f, &s->timer1); VMSTATE_UINT8(lock, fdctrl_t),
qemu_get_8s(f, &s->precomp_trk); VMSTATE_UINT8(pwrd, fdctrl_t),
qemu_get_8s(f, &s->config); VMSTATE_UINT8_EQUAL(num_floppies, fdctrl_t),
qemu_get_8s(f, &s->lock); VMSTATE_STRUCT_ARRAY(drives, fdctrl_t, MAX_FD, 1,
qemu_get_8s(f, &s->pwrd); vmstate_fdrive, fdrive_t),
qemu_get_8s(f, &n); VMSTATE_END_OF_LIST()
if (n > MAX_FD)
return -EINVAL;
for (i = 0; i < n; i++) {
ret = fd_load(f, &s->drives[i]);
if (ret != 0)
break;
} }
};
return ret;
}
static void fdctrl_external_reset(void *opaque) static void fdctrl_external_reset(void *opaque)
{ {
@ -1951,14 +1919,16 @@ static int fdctrl_init_common(fdctrl_t *fdctrl)
FLOPPY_DPRINTF("init controller\n"); FLOPPY_DPRINTF("init controller\n");
fdctrl->fifo = qemu_memalign(512, FD_SECTOR_LEN); fdctrl->fifo = qemu_memalign(512, FD_SECTOR_LEN);
fdctrl->fifo_size = 512;
fdctrl->result_timer = qemu_new_timer(vm_clock, fdctrl->result_timer = qemu_new_timer(vm_clock,
fdctrl_result_timer, fdctrl); fdctrl_result_timer, fdctrl);
fdctrl->version = 0x90; /* Intel 82078 controller */ fdctrl->version = 0x90; /* Intel 82078 controller */
fdctrl->config = FD_CONFIG_EIS | FD_CONFIG_EFIFO; /* Implicit seek, polling & FIFO enabled */ fdctrl->config = FD_CONFIG_EIS | FD_CONFIG_EFIFO; /* Implicit seek, polling & FIFO enabled */
fdctrl->num_floppies = MAX_FD;
fdctrl_external_reset(fdctrl); fdctrl_external_reset(fdctrl);
register_savevm("fdc", -1, 2, fdc_save, fdc_load, fdctrl); vmstate_register(-1, &vmstate_fdc, fdctrl);
qemu_register_reset(fdctrl_external_reset, fdctrl); qemu_register_reset(fdctrl_external_reset, fdctrl);
return 0; return 0;
} }