[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support |
Date: |
Fri, 5 Apr 2013 18:13:16 +0100 |
Add a vmstate to pflash_cfi01, so that it can be live migrated.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
hw/pflash_cfi01.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 20d10b3..646dc79 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -67,7 +67,7 @@ struct pflash_t {
uint64_t sector_len;
uint8_t width;
uint8_t be;
- int wcycle; /* if 0, the flash is read normally */
+ uint8_t wcycle; /* if 0, the flash is read normally */
int ro;
uint8_t cmd;
uint8_t status;
@@ -77,7 +77,7 @@ struct pflash_t {
uint16_t ident3;
uint8_t cfi_len;
uint8_t cfi_table[0x52];
- hwaddr counter;
+ uint64_t counter;
unsigned int writeblock_size;
QEMUTimer *timer;
MemoryRegion mem;
@@ -85,6 +85,19 @@ struct pflash_t {
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)
{
pflash_t *pfl = opaque;
@@ -223,7 +236,7 @@ static inline void pflash_data_write(pflash_t *pfl, hwaddr
offset,
uint8_t *p = pfl->storage;
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);
switch (width) {
case 1:
@@ -701,6 +714,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass,
void *data)
k->init = pflash_cfi01_init;
dc->props = pflash_cfi01_properties;
+ dc->vmsd = &vmstate_pflash;
}
--
1.7.9.5
- [Qemu-devel] [PULL 00/14] arm-devs queue, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 04/14] vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 14/14] hw/nand.c: Fix nand erase operation, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 12/14] pl330: Don't inhibit ES bits on INTEN, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support,
Peter Maydell <=
- [Qemu-devel] [PATCH 05/14] hw/sd.c: fix migration of dynamically allocated buffer "buf", Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stderr, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 13/14] cadence_uart: Flush queued characters on reset, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 09/14] hw/arm_gic_common: Use vmstate struct rather than save/load functions, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 08/14] arm_gic: Fix sizes of state fields in preparation for vmstate support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 07/14] vmstate: Add support for two dimensional arrays, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 02/14] pl050: Don't send always-constant is_mouse field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 06/14] hw/onenand.c: fix migration of dynamically allocated buffer "otp", Peter Maydell, 2013/04/05
- Re: [Qemu-devel] [PULL 00/14] arm-devs queue, Blue Swirl, 2013/04/06