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

pflash_cfi01: Implement migration support

Browse Source 
Add a vmstate to pflash_cfi01, so that it can be live migrated.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1363717469-30980-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-04-05 16:18:00 +01:00
parent 5d79b80b33
commit d8d24fb78c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/pflash_cfi01.c
View File

@ -67,7 +67,7 @@ struct pflash_t {
uint64_t sector_len; uint64_t sector_len;
uint8_t width; uint8_t width;
uint8_t be; uint8_t be;
int wcycle; /* if 0, the flash is read normally */ uint8_t wcycle; /* if 0, the flash is read normally */
int ro; int ro;
uint8_t cmd; uint8_t cmd;
uint8_t status; uint8_t status;
@ -77,7 +77,7 @@ struct pflash_t {
uint16_t ident3; uint16_t ident3;
uint8_t cfi_len; uint8_t cfi_len;
uint8_t cfi_table[0x52]; uint8_t cfi_table[0x52];
hwaddr counter; uint64_t counter;
unsigned int writeblock_size; unsigned int writeblock_size;
QEMUTimer *timer; QEMUTimer *timer;
MemoryRegion mem; MemoryRegion mem;
@ -85,6 +85,19 @@ struct pflash_t {
void *storage; void *storage;
}; };
static const VMStateDescription vmstate_pflash = {
.name = "pflash_cfi01",
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_UINT8(wcycle, pflash_t),
VMSTATE_UINT8(cmd, pflash_t),
VMSTATE_UINT8(status, pflash_t),
VMSTATE_UINT64(counter, pflash_t),
VMSTATE_END_OF_LIST()
}
};
static void pflash_timer (void *opaque) static void pflash_timer (void *opaque)
{ {
pflash_t *pfl = opaque; pflash_t *pfl = opaque;
@ -223,7 +236,7 @@ static inline void pflash_data_write(pflash_t *pfl, hwaddr offset,
uint8_t *p = pfl->storage; uint8_t *p = pfl->storage;
DPRINTF("%s: block write offset " TARGET_FMT_plx DPRINTF("%s: block write offset " TARGET_FMT_plx
" value %x counter " TARGET_FMT_plx "\n", " value %x counter %016" PRIx64 "\n",
__func__, offset, value, pfl->counter); __func__, offset, value, pfl->counter);
switch (width) { switch (width) {
case 1: case 1:
@ -701,6 +714,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
k->init = pflash_cfi01_init; k->init = pflash_cfi01_init;
dc->props = pflash_cfi01_properties; dc->props = pflash_cfi01_properties;
dc->vmsd = &vmstate_pflash;
} }