Save state error handling (kill off no_migrate)
cover Save state error handling (kill off no_migrate)
No changes from previous version
--
Our code paths for saving or migrating a VM are full of functions that return void, leaving no opportunity for a device to cancel a migration, either from error or incompatibility. The ivshmem driver attempted to solve this with a no_migrate flag on the save state entry. I think the more generic and flexible way to solve this is to allow driver save functions to fail. This series implements that and converts ivshmem to uses a set_params function to NAK migration much earlier in the processes. This touches a lot of files, but bulk of those changes are simply s/void/int/ and tacking a "return 0" to the end of functions. Thanks,
Alex
---
Alex Williamson (6):
savevm: Remove register_device_unmigratable()
savevm: Allow set_params and save_live_state to error
virtio: Allow virtio_save() errors
pci: Allow pci_device_save() to return error
savevm: Allow vmsd->pre_save to return error
savevm: Allow SaveStateHandler() to return error
block-migration.c | 4 +- hw/adb.c | 8 +++- hw/ads7846.c | 4 +- hw/arm_gic.c | 4 +- hw/arm_timer.c | 6 ++- hw/armv7m_nvic.c | 4 +- hw/cuda.c | 4 +- hw/fdc.c | 3 + hw/g364fb.c | 4 +- hw/grackle_pci.c | 4 +- hw/gt64xxx.c | 4 +- hw/heathrow_pic.c | 4 +- hw/hpet.c | 3 + hw/hw.h | 12 ++---- hw/i2c.c | 3 + hw/ide/core.c | 4 +- hw/ivshmem.c | 30 +++++++++++---- hw/lsi53c895a.c | 4 +- hw/m48t59.c | 4 +- hw/mac_dbdma.c | 4 +- hw/mac_nvram.c | 4 +- hw/max111x.c | 4 +- hw/mipsnet.c | 4 +- hw/mst_fpga.c | 3 + hw/nand.c | 3 + hw/openpic.c | 4 +- hw/pci.c | 9 +++- hw/pci.h | 2 - hw/piix4.c | 4 +- hw/pl011.c | 4 +- hw/pl022.c | 4 +- hw/pl061.c | 4 +- hw/ppc4xx_pci.c | 11 ++++- hw/ppce500_pci.c | 11 ++++- hw/pxa2xx.c | 28 ++++++++++---- hw/pxa2xx_dma.c | 4 +- hw/pxa2xx_gpio.c | 4 +- hw/pxa2xx_keypad.c | 3 + hw/pxa2xx_lcd.c | 4 +- hw/pxa2xx_mmci.c | 4 +- hw/pxa2xx_pic.c | 4 +- hw/pxa2xx_timer.c | 4 +- hw/rc4030.c | 4 +- hw/rtl8139.c | 4 +- hw/serial.c | 3 + hw/spitz.c | 14 +++++-- hw/ssd0323.c | 4 +- hw/ssi-sd.c | 4 +- hw/stellaris.c | 20 +++++++--- hw/stellaris_enet.c | 4 +- hw/stellaris_input.c | 4 +- hw/syborg_fb.c | 4 +- hw/syborg_interrupt.c | 3 + hw/syborg_keyboard.c | 3 + hw/syborg_pointer.c | 3 + hw/syborg_rtc.c | 4 +- hw/syborg_serial.c | 4 +- hw/syborg_timer.c | 4 +- hw/tsc2005.c | 4 +- hw/tsc210x.c | 4 +- hw/twl92230.c | 3 + hw/unin_pci.c | 4 +- hw/usb-uhci.c | 3 + hw/virtio-balloon.c | 9 +++- hw/virtio-blk.c | 10 ++++- hw/virtio-net.c | 10 ++++- hw/virtio-pci.c | 10 ++++- hw/virtio-serial-bus.c | 10 ++++- hw/virtio.c | 14 +++++-- hw/virtio.h | 4 +- hw/wm8750.c | 3 + hw/zaurus.c | 4 +- qemu-common.h | 2 - savevm.c | 88 +++++++++++++++++++------------------------ slirp/slirp.c | 6 ++- target-arm/machine.c | 3 + target-cris/machine.c | 3 + target-i386/machine.c | 7 ++- target-microblaze/machine.c | 3 + target-mips/machine.c | 3 + target-ppc/machine.c | 3 + target-s390x/machine.c | 3 + target-sparc/machine.c | 3 + 83 files changed, 364 insertions(+), 181 deletions(-)
PATCH RESEND 1/6 savevm: Allow SaveStateHandler() to return error
Some devices may not always able to save their state, allow the save handler to return an error.
---
hw/adb.c | 8 ++++++-- hw/ads7846.c | 4 +++- hw/arm_gic.c | 4 +++- hw/arm_timer.c | 6 ++++-- hw/armv7m_nvic.c | 4 +++- hw/cuda.c | 4 +++- hw/g364fb.c | 4 +++- hw/grackle_pci.c | 4 +++- hw/gt64xxx.c | 3 ++- hw/heathrow_pic.c | 4 +++- hw/hw.h | 2 +- hw/ivshmem.c | 3 ++- hw/m48t59.c | 4 +++- hw/mac_dbdma.c | 4 +++- hw/mac_nvram.c | 4 +++- hw/max111x.c | 4 +++- hw/mipsnet.c | 4 +++- hw/mst_fpga.c | 3 ++- hw/nand.c | 3 ++- hw/openpic.c | 4 +++- hw/piix4.c | 3 ++- hw/pl011.c | 4 +++- hw/pl022.c | 4 +++- hw/pl061.c | 4 +++- hw/ppc4xx_pci.c | 4 +++- hw/ppce500_pci.c | 4 +++- hw/pxa2xx.c | 28 +++++++++++++++++++++------- hw/pxa2xx_dma.c | 4 +++- hw/pxa2xx_gpio.c | 4 +++- hw/pxa2xx_keypad.c | 3 ++- hw/pxa2xx_lcd.c | 4 +++- hw/pxa2xx_mmci.c | 4 +++- hw/pxa2xx_pic.c | 4 +++- hw/pxa2xx_timer.c | 4 +++- hw/rc4030.c | 4 +++- hw/spitz.c | 14 ++++++++++---- hw/ssd0323.c | 4 +++- hw/ssi-sd.c | 4 +++- hw/stellaris.c | 20 +++++++++++++++----- hw/stellaris_enet.c | 4 +++- hw/stellaris_input.c | 4 +++- hw/syborg_fb.c | 4 +++- hw/syborg_interrupt.c | 3 ++- hw/syborg_keyboard.c | 3 ++- hw/syborg_pointer.c | 3 ++- hw/syborg_rtc.c | 4 +++- hw/syborg_serial.c | 4 +++- hw/syborg_timer.c | 4 +++- hw/tsc2005.c | 4 +++- hw/tsc210x.c | 4 +++- hw/unin_pci.c | 4 +++- hw/virtio-balloon.c | 3 ++- hw/virtio-blk.c | 4 +++- hw/virtio-net.c | 4 +++- hw/virtio-serial-bus.c | 4 +++- hw/zaurus.c | 4 +++- qemu-common.h | 2 +- savevm.c | 3 +-- slirp/slirp.c | 6 ++++-- target-arm/machine.c | 3 ++- target-cris/machine.c | 3 ++- target-i386/machine.c | 3 ++- target-microblaze/machine.c | 3 ++- target-mips/machine.c | 3 ++- target-ppc/machine.c | 3 ++- target-s390x/machine.c | 3 ++- target-sparc/machine.c | 3 ++- 67 files changed, 219 insertions(+), 84 deletions(-)
hw/adb.c +6 -2
@@ -261,7 +261,7 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,return olen; } -static void adb_kbd_save (QEMUFile *f,void *opaque) +static int adb_kbd_save (QEMUFile *f,void *opaque) {KBDState *s = (KBDState *)opaque;
@@ -269,6 +269,8 @@ static void adb_kbd_save(QEMUFile *f, void *opaque)qemu_put_sbe32s (f, &s->rptr);qemu_put_sbe32s (f, &s->wptr);qemu_put_sbe32s (f, &s->count); + +return 0 ; }static int adb_kbd_load (QEMUFile *f,void *opaque,int version_id)
@@ -439,7 +441,7 @@ static int adb_mouse_reset(ADBDevice *d)return 0 ; } -static void adb_mouse_save (QEMUFile *f,void *opaque) +static int adb_mouse_save (QEMUFile *f,void *opaque) {MouseState *s = (MouseState *)opaque;
@@ -448,6 +450,8 @@ static void adb_mouse_save(QEMUFile *f, void *opaque)qemu_put_sbe32s (f, &s->dx);qemu_put_sbe32s (f, &s->dy);qemu_put_sbe32s (f, &s->dz); + +return 0 ; }static int adb_mouse_load (QEMUFile *f,void *opaque,int version_id)
hw/ads7846.c +3 -1
@@ -105,7 +105,7 @@ static void ads7846_ts_event(void *opaque, } } -static void ads7846_save (QEMUFile *f,void *opaque) +static int ads7846_save (QEMUFile *f,void *opaque) {ADS7846State *s = (ADS7846State *) opaque;int i;
@@ -115,6 +115,8 @@ static void ads7846_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->noise);qemu_put_be32 (f, s->cycle);qemu_put_be32 (f, s->output); + +return 0 ; }static int ads7846_load (QEMUFile *f,void *opaque,int version_id)
hw/arm_gic.c +3 -1
@@ -653,7 +653,7 @@ static void gic_reset(gic_state *s)#endif } -static void gic_save (QEMUFile *f,void *opaque) +static int gic_save (QEMUFile *f,void *opaque) {gic_state *s = (gic_state *)opaque;int i;
@@ -685,6 +685,8 @@ static void gic_save(QEMUFile *f, void *opaque)qemu_put_byte (f, s->irq_state[i].model);qemu_put_byte (f, s->irq_state[i].trigger); } + +return 0 ; }static int gic_load (QEMUFile *f,void *opaque,int version_id)
hw/arm_timer.c +4 -2
@@ -140,13 +140,14 @@ static void arm_timer_tick(void *opaque)arm_timer_update (s); } -static void arm_timer_save (QEMUFile *f,void *opaque) +static int arm_timer_save (QEMUFile *f,void *opaque) {arm_timer_state *s = (arm_timer_state *)opaque;qemu_put_be32 (f, s->control);qemu_put_be32 (f, s->limit);qemu_put_be32 (f, s->int_level);qemu_put_ptimer (f, s->timer); +return 0 ; }static int arm_timer_load (QEMUFile *f,void *opaque,int version_id)
@@ -235,11 +236,12 @@ static CPUWriteMemoryFunc * const sp804_writefn[] = { sp804_write }; -static void sp804_save (QEMUFile *f,void *opaque) +static int sp804_save (QEMUFile *f,void *opaque) {sp804_state *s = (sp804_state *)opaque;qemu_put_be32 (f, s->level[0 ]);qemu_put_be32 (f, s->level[1 ]); +return 0 ; }static int sp804_load (QEMUFile *f,void *opaque,int version_id)
hw/armv7m_nvic.c +3 -1
@@ -365,7 +365,7 @@ static void nvic_writel(void *opaque, uint32_t offset, uint32_t value) } } -static void nvic_save (QEMUFile *f,void *opaque) +static int nvic_save (QEMUFile *f,void *opaque) {nvic_state *s = (nvic_state *)opaque;
@@ -373,6 +373,8 @@ static void nvic_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->systick.reload);qemu_put_be64 (f, s->systick.tick);qemu_put_timer (f, s->systick.timer); + +return 0 ; }static int nvic_load (QEMUFile *f,void *opaque,int version_id)
hw/cuda.c +3 -1
@@ -654,7 +654,7 @@ static void cuda_save_timer(QEMUFile *f, CUDATimer *s)qemu_put_timer (f, s->timer); } -static void cuda_save (QEMUFile *f,void *opaque) +static int cuda_save (QEMUFile *f,void *opaque) {CUDAState *s = (CUDAState *)opaque;
@@ -677,6 +677,8 @@ static void cuda_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->tick_offset);cuda_save_timer (f, &s->timers[0 ]);cuda_save_timer (f, &s->timers[1 ]); + +return 0 ; }static void cuda_load_timer (QEMUFile *f,CUDATimer *s)
hw/g364fb.c +3 -1
@@ -564,7 +564,7 @@ static int g364fb_load(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static void g364fb_save (QEMUFile *f,void *opaque) +static int g364fb_save (QEMUFile *f,void *opaque) {G364State *s = opaque;int i;
@@ -581,6 +581,8 @@ static void g364fb_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->top_of_screen);qemu_put_be32 (f, s->width);qemu_put_be32 (f, s->height); + +return 0 ; } int g364fb_mm_init(target_phys_addr_t vram_base,
hw/grackle_pci.c +3 -1
@@ -57,11 +57,13 @@ static void pci_grackle_set_irq(void *opaque, int irq_num, int level)qemu_set_irq (pic[irq_num +0x15 ], level); } -static void pci_grackle_save (QEMUFile * f,void *opaque) +static int pci_grackle_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque;pci_device_save (d, f); + +return 0 ; }static int pci_grackle_load (QEMUFile * f,void *opaque,int version_id)
hw/gt64xxx.c +2 -1
@@ -1086,10 +1086,11 @@ static void gt64120_reset(void *opaque)gt64120_pci_mapping (s); } -static void gt64120_save (QEMUFile * f,void *opaque) +static int gt64120_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque;pci_device_save (d, f); +return 0 ; }static int gt64120_load (QEMUFile * f,void *opaque,int version_id)
hw/heathrow_pic.c +3 -1
@@ -169,12 +169,14 @@ static void heathrow_pic_save_one(QEMUFile *f, HeathrowPIC *s)qemu_put_be32s (f, &s->level_triggered); } -static void heathrow_pic_save (QEMUFile *f,void *opaque) +static int heathrow_pic_save (QEMUFile *f,void *opaque) {HeathrowPICS *s = (HeathrowPICS *)opaque;heathrow_pic_save_one (f, &s->pics[0 ]);heathrow_pic_save_one (f, &s->pics[1 ]); + +return 0 ; }static void heathrow_pic_load_one (QEMUFile *f,HeathrowPIC *s)
hw/hw.h +1 -1
@@ -240,7 +240,7 @@ int64_t qemu_ftell(QEMUFile *f);int64_t qemu_fseek (QEMUFile *f,int64_t pos,int whence);typedef void SaveSetParamsHandler (int blk_enable,int shared,void * opaque); -typedef void SaveStateHandler (QEMUFile *f,void *opaque); +typedef int SaveStateHandler (QEMUFile *f,void *opaque);typedef int SaveLiveStateHandler (Monitor *mon,QEMUFile *f,int stage,void *opaque);typedef int LoadStateHandler (QEMUFile *f,void *opaque,int version_id);
hw/ivshmem.c +2 -1
@@ -616,7 +616,7 @@ static void ivshmem_setup_msi(IVShmemState * s) { s->eventfd_table =qemu_mallocz (s->vectors *sizeof (EventfdEntry)); } -static void ivshmem_save (QEMUFile * f,void *opaque) +static int ivshmem_save (QEMUFile * f,void *opaque) {IVShmemState *proxy = opaque;
@@ -630,6 +630,7 @@ static void ivshmem_save(QEMUFile* f, void *opaque)qemu_put_be32 (f, proxy->intrmask); } +return 0 ; }static int ivshmem_load (QEMUFile * f,void *opaque,int version_id)
hw/m48t59.c +3 -1
@@ -585,13 +585,15 @@ static CPUReadMemoryFunc * const nvram_read[] = { &nvram_readl, }; -static void m48t59_save (QEMUFile *f,void *opaque) +static int m48t59_save (QEMUFile *f,void *opaque) {M48t59State *s = opaque;qemu_put_8s (f, &s->lock);qemu_put_be16s (f, &s->addr);qemu_put_buffer (f, s->buffer, s->size); + +return 0 ; }static int m48t59_load (QEMUFile *f,void *opaque,int version_id)
hw/mac_dbdma.c +3 -1
@@ -804,7 +804,7 @@ static CPUReadMemoryFunc * const dbdma_read[] = { dbdma_readl, }; -static void dbdma_save (QEMUFile *f,void *opaque) +static int dbdma_save (QEMUFile *f,void *opaque) {DBDMA_channel *s = opaque;unsigned int i, j;
@@ -812,6 +812,8 @@ static void dbdma_save(QEMUFile *f, void *opaque)for (i =0 ; i <DBDMA_CHANNELS ; i++)for (j =0 ; j <DBDMA_REGS ; j++)qemu_put_be32s (f, &s[i].regs[j]); + +return 0 ; }static int dbdma_load (QEMUFile *f,void *opaque,int version_id)
hw/mac_nvram.c +3 -1
@@ -105,11 +105,13 @@ static CPUReadMemoryFunc * const nvram_read[] = { &macio_nvram_readb, }; -static void macio_nvram_save (QEMUFile *f,void *opaque) +static int macio_nvram_save (QEMUFile *f,void *opaque) {MacIONVRAMState *s = (MacIONVRAMState *)opaque;qemu_put_buffer (f, s->data, s->size); + +return 0 ; }static int macio_nvram_load (QEMUFile *f,void *opaque,int version_id)
hw/max111x.c +3 -1
@@ -94,7 +94,7 @@ static uint32_t max111x_transfer(SSISlave *dev, uint32_t value)return max111x_read (s); } -static void max111x_save (QEMUFile *f,void *opaque) +static int max111x_save (QEMUFile *f,void *opaque) {MAX111xState *s = (MAX111xState *) opaque;int i;
@@ -106,6 +106,8 @@ static void max111x_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->com);for (i =0 ; i < s->inputs; i ++)qemu_put_byte (f, s->input[i]); + +return 0 ; }static int max111x_load (QEMUFile *f,void *opaque,int version_id)
hw/mipsnet.c +3 -1
@@ -202,7 +202,7 @@ static void mipsnet_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } -static void mipsnet_save (QEMUFile *f,void *opaque) +static int mipsnet_save (QEMUFile *f,void *opaque) {MIPSnetState *s = opaque;
@@ -214,6 +214,8 @@ static void mipsnet_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->intctl);qemu_put_buffer (f, s->rx_buffer,MAX_ETH_FRAME_SIZE );qemu_put_buffer (f, s->tx_buffer,MAX_ETH_FRAME_SIZE ); + +return 0 ; }static int mipsnet_load (QEMUFile *f,void *opaque,int version_id)
hw/mst_fpga.c +2 -1
@@ -175,7 +175,7 @@ static CPUWriteMemoryFunc * const mst_fpga_writefn[] = { mst_fpga_writeb, }; -static void +static int mst_fpga_save (QEMUFile *f,void *opaque) {struct mst_irq_state *s = (mst_irq_state *) opaque;
@@ -193,6 +193,7 @@ mst_fpga_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->intsetclr);qemu_put_be32s (f, &s->pcmcia0);qemu_put_be32s (f, &s->pcmcia1); +return 0 ; } static int
hw/nand.c +2 -1
@@ -281,7 +281,7 @@ static void nand_command(NANDFlashState *s) } } -static void nand_save (QEMUFile *f,void *opaque) +static int nand_save (QEMUFile *f,void *opaque) {NANDFlashState *s = (NANDFlashState *) opaque;qemu_put_byte (f, s->cle);
@@ -299,6 +299,7 @@ static void nand_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->status);qemu_put_be32 (f, s->offset);/* XXX: do we want to save s->storage too? */ +return 0 ; }static int nand_load (QEMUFile *f,void *opaque,int version_id)
hw/openpic.c +3 -1
@@ -1052,7 +1052,7 @@ static void openpic_save_IRQ_queue(QEMUFile* f, IRQ_queue_t *q)qemu_put_sbe32s (f, &q->priority); } -static void openpic_save (QEMUFile * f,void *opaque) +static int openpic_save (QEMUFile * f,void *opaque) {openpic_t *opp = (openpic_t *)opaque;unsigned int i;
@@ -1103,6 +1103,8 @@ static void openpic_save(QEMUFile* f, void *opaque)#endif pci_device_save (&opp->pci_dev, f); + +return 0 ; }static void openpic_load_IRQ_queue (QEMUFile * f,IRQ_queue_t *q)
hw/piix4.c +2 -1
@@ -68,10 +68,11 @@ static void piix4_reset(void *opaque) pci_conf[0xae ] =0x00 ; } -static void piix_save (QEMUFile * f,void *opaque) +static int piix_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque;pci_device_save (d, f); +return 0 ; }static int piix_load (QEMUFile * f,void *opaque,int version_id)
hw/pl011.c +3 -1
@@ -235,7 +235,7 @@ static CPUWriteMemoryFunc * const pl011_writefn[] = { pl011_write }; -static void pl011_save (QEMUFile *f,void *opaque) +static int pl011_save (QEMUFile *f,void *opaque) {pl011_state *s = (pl011_state *)opaque;int i;
@@ -256,6 +256,8 @@ static void pl011_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->read_pos);qemu_put_be32 (f, s->read_count);qemu_put_be32 (f, s->read_trigger); + +return 0 ; }static int pl011_load (QEMUFile *f,void *opaque,int version_id)
hw/pl022.c +3 -1
@@ -239,7 +239,7 @@ static CPUWriteMemoryFunc * const pl022_writefn[] = { pl022_write }; -static void pl022_save (QEMUFile *f,void *opaque) +static int pl022_save (QEMUFile *f,void *opaque) {pl022_state *s = (pl022_state *)opaque;int i;
@@ -259,6 +259,8 @@ static void pl022_save(QEMUFile *f, void *opaque)qemu_put_be16 (f, s->tx_fifo[i]);qemu_put_be16 (f, s->rx_fifo[i]); } + +return 0 ; }static int pl022_load (QEMUFile *f,void *opaque,int version_id)
hw/pl061.c +3 -1
@@ -235,7 +235,7 @@ static CPUWriteMemoryFunc * const pl061_writefn[] = { pl061_write }; -static void pl061_save (QEMUFile *f,void *opaque) +static int pl061_save (QEMUFile *f,void *opaque) {pl061_state *s = (pl061_state *)opaque;
@@ -259,6 +259,8 @@ static void pl061_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->den);qemu_put_be32 (f, s->cr);qemu_put_be32 (f, s->float_high); + +return 0 ; }static int pl061_load (QEMUFile *f,void *opaque,int version_id)
hw/ppc4xx_pci.c +3 -1
@@ -298,7 +298,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_num, int level)qemu_set_irq (pci_irqs[irq_num], level); } -static void ppc4xx_pci_save (QEMUFile *f,void *opaque) +static int ppc4xx_pci_save (QEMUFile *f,void *opaque) {PPC4xxPCIState *controller = opaque;int i;
@@ -316,6 +316,8 @@ static void ppc4xx_pci_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &controller->ptm[i].ms);qemu_put_be32s (f, &controller->ptm[i].la); } + +return 0 ; }static int ppc4xx_pci_load (QEMUFile *f,void *opaque,int version_id)
hw/ppce500_pci.c +3 -1
@@ -216,7 +216,7 @@ static void mpc85xx_pci_set_irq(void *opaque, int irq_num, int level)qemu_set_irq (pic[irq_num], level); } -static void ppce500_pci_save (QEMUFile *f,void *opaque) +static int ppce500_pci_save (QEMUFile *f,void *opaque) {PPCE500PCIState *controller = opaque;int i;
@@ -237,6 +237,8 @@ static void ppce500_pci_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &controller->pib[i].piwar); }qemu_put_be32s (f, &controller->gasket_time); + +return 0 ; }static int ppce500_pci_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx.c +21 -7
@@ -147,13 +147,15 @@ static CPUWriteMemoryFunc * const pxa2xx_pm_writefn[] = { pxa2xx_pm_write, }; -static void pxa2xx_pm_save (QEMUFile *f,void *opaque) +static int pxa2xx_pm_save (QEMUFile *f,void *opaque) {PXA2xxState *s = (PXA2xxState *) opaque;int i;for (i =0 ; i <0x40 ; i ++)qemu_put_be32s (f, &s->pm_regs[i]); + +return 0 ; }static int pxa2xx_pm_load (QEMUFile *f,void *opaque,int version_id)
@@ -228,7 +230,7 @@ static CPUWriteMemoryFunc * const pxa2xx_cm_writefn[] = { pxa2xx_cm_write, }; -static void pxa2xx_cm_save (QEMUFile *f,void *opaque) +static int pxa2xx_cm_save (QEMUFile *f,void *opaque) {PXA2xxState *s = (PXA2xxState *) opaque;int i;
@@ -237,6 +239,8 @@ static void pxa2xx_cm_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->cm_regs[i]);qemu_put_be32s (f, &s->clkcfg);qemu_put_be32s (f, &s->pmnc); + +return 0 ; }static int pxa2xx_cm_load (QEMUFile *f,void *opaque,int version_id)
@@ -528,13 +532,15 @@ static CPUWriteMemoryFunc * const pxa2xx_mm_writefn[] = { pxa2xx_mm_write, }; -static void pxa2xx_mm_save (QEMUFile *f,void *opaque) +static int pxa2xx_mm_save (QEMUFile *f,void *opaque) {PXA2xxState *s = (PXA2xxState *) opaque;int i;for (i =0 ; i <0x1a ; i ++)qemu_put_be32s (f, &s->mm_regs[i]); + +return 0 ; }static int pxa2xx_mm_load (QEMUFile *f,void *opaque,int version_id)
@@ -804,7 +810,7 @@ static CPUWriteMemoryFunc * const pxa2xx_ssp_writefn[] = { pxa2xx_ssp_write, }; -static void pxa2xx_ssp_save (QEMUFile *f,void *opaque) +static int pxa2xx_ssp_save (QEMUFile *f,void *opaque) {PXA2xxSSPState *s = (PXA2xxSSPState *) opaque;int i;
@@ -824,6 +830,8 @@ static void pxa2xx_ssp_save(QEMUFile *f, void *opaque)qemu_put_byte (f, s->rx_level);for (i =0 ; i < s->rx_level; i ++)qemu_put_byte (f, s->rx_fifo[(s->rx_start + i) &0xf ]); + +return 0 ; }static int pxa2xx_ssp_load (QEMUFile *f,void *opaque,int version_id)
@@ -1198,7 +1206,7 @@ static void pxa2xx_rtc_init(PXA2xxState *s) s->rtc_pi =qemu_new_timer (rt_clock, pxa2xx_rtc_pi_tick, s); } -static void pxa2xx_rtc_save (QEMUFile *f,void *opaque) +static int pxa2xx_rtc_save (QEMUFile *f,void *opaque) {PXA2xxState *s = (PXA2xxState *) opaque;
@@ -1224,6 +1232,8 @@ static void pxa2xx_rtc_save(QEMUFile *f, void *opaque)qemu_put_sbe64s (f, &s->last_hz);qemu_put_sbe64s (f, &s->last_sw);qemu_put_sbe64s (f, &s->last_pi); + +return 0 ; }static int pxa2xx_rtc_load (QEMUFile *f,void *opaque,int version_id)
@@ -1679,7 +1689,7 @@ static CPUWriteMemoryFunc * const pxa2xx_i2s_writefn[] = { pxa2xx_i2s_write, }; -static void pxa2xx_i2s_save (QEMUFile *f,void *opaque) +static int pxa2xx_i2s_save (QEMUFile *f,void *opaque) {PXA2xxI2SState *s = (PXA2xxI2SState *) opaque;
@@ -1693,6 +1703,8 @@ static void pxa2xx_i2s_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->rx_len);qemu_put_be32 (f, s->tx_len);qemu_put_be32 (f, s->fifo_len); + +return 0 ; }static int pxa2xx_i2s_load (QEMUFile *f,void *opaque,int version_id)
@@ -1955,7 +1967,7 @@ static void pxa2xx_fir_event(void *opaque, int event) { } -static void pxa2xx_fir_save (QEMUFile *f,void *opaque) +static int pxa2xx_fir_save (QEMUFile *f,void *opaque) {PXA2xxFIrState *s = (PXA2xxFIrState *) opaque;int i;
@@ -1971,6 +1983,8 @@ static void pxa2xx_fir_save(QEMUFile *f, void *opaque)qemu_put_byte (f, s->rx_len);for (i =0 ; i < s->rx_len; i ++)qemu_put_byte (f, s->rx_fifo[(s->rx_start + i) &63 ]); + +return 0 ; }static int pxa2xx_fir_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_dma.c +3 -1
@@ -428,7 +428,7 @@ static CPUWriteMemoryFunc * const pxa2xx_dma_writefn[] = { pxa2xx_dma_write }; -static void pxa2xx_dma_save (QEMUFile *f,void *opaque) +static int pxa2xx_dma_save (QEMUFile *f,void *opaque) {PXA2xxDMAState *s = (PXA2xxDMAState *) opaque;int i;
@@ -452,6 +452,8 @@ static void pxa2xx_dma_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->chan[i].state);qemu_put_be32 (f, s->chan[i].request); }; + +return 0 ; }static int pxa2xx_dma_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_gpio.c +3 -1
@@ -249,7 +249,7 @@ static CPUWriteMemoryFunc * const pxa2xx_gpio_writefn[] = { pxa2xx_gpio_write }; -static void pxa2xx_gpio_save (QEMUFile *f,void *opaque) +static int pxa2xx_gpio_save (QEMUFile *f,void *opaque) {PXA2xxGPIOInfo *s = (PXA2xxGPIOInfo *) opaque;int i;
@@ -268,6 +268,8 @@ static void pxa2xx_gpio_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->prev_level[i]); } + +return 0 ; }static int pxa2xx_gpio_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_keypad.c +2 -1
@@ -269,7 +269,7 @@ static CPUWriteMemoryFunc * const pxa2xx_keypad_writefn[] = { pxa2xx_keypad_write }; -static void pxa2xx_keypad_save (QEMUFile *f,void *opaque) +static int pxa2xx_keypad_save (QEMUFile *f,void *opaque) {PXA2xxKeyPadState *s = (PXA2xxKeyPadState *) opaque;
@@ -284,6 +284,7 @@ static void pxa2xx_keypad_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->kpasmkp3);qemu_put_be32s (f, &s->kpkdi); +return 0 ; }static int pxa2xx_keypad_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_lcd.c +3 -1
@@ -831,7 +831,7 @@ static void pxa2xx_lcdc_orientation(void *opaque, int angle)pxa2xx_lcdc_resize (s); } -static void pxa2xx_lcdc_save (QEMUFile *f,void *opaque) +static int pxa2xx_lcdc_save (QEMUFile *f,void *opaque) {PXA2xxLCDState *s = (PXA2xxLCDState *) opaque;int i;
@@ -864,6 +864,8 @@ static void pxa2xx_lcdc_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->dma_ch[i].id);qemu_put_be32s (f, &s->dma_ch[i].command); } + +return 0 ; }static int pxa2xx_lcdc_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_mmci.c +3 -1
@@ -439,7 +439,7 @@ static CPUWriteMemoryFunc * const pxa2xx_mmci_writefn[] = { pxa2xx_mmci_writew }; -static void pxa2xx_mmci_save (QEMUFile *f,void *opaque) +static int pxa2xx_mmci_save (QEMUFile *f,void *opaque) {PXA2xxMMCIState *s = (PXA2xxMMCIState *) opaque;int i;
@@ -471,6 +471,8 @@ static void pxa2xx_mmci_save(QEMUFile *f, void *opaque)qemu_put_byte (f, s->resp_len);for (i = s->resp_len; i <9 ; i ++)qemu_put_be16s (f, &s->resp_fifo[i]); + +return 0 ; }static int pxa2xx_mmci_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_pic.c +3 -1
@@ -241,7 +241,7 @@ static CPUWriteMemoryFunc * const pxa2xx_pic_writefn[] = { pxa2xx_pic_mem_write, }; -static void pxa2xx_pic_save (QEMUFile *f,void *opaque) +static int pxa2xx_pic_save (QEMUFile *f,void *opaque) {PXA2xxPICState *s = (PXA2xxPICState *) opaque;int i;
@@ -255,6 +255,8 @@ static void pxa2xx_pic_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->int_idle);for (i =0 ; i <PXA2XX_PIC_SRCS ; i ++)qemu_put_be32s (f, &s->priority[i]); + +return 0 ; }static int pxa2xx_pic_load (QEMUFile *f,void *opaque,int version_id)
hw/pxa2xx_timer.c +3 -1
@@ -360,7 +360,7 @@ static void pxa2xx_timer_tick4(void *opaque)pxa2xx_timer_update4 (i,qemu_get_clock (vm_clock), t->tm.num -4 ); } -static void pxa2xx_timer_save (QEMUFile *f,void *opaque) +static int pxa2xx_timer_save (QEMUFile *f,void *opaque) {pxa2xx_timer_info *s = (pxa2xx_timer_info *) opaque;int i;
@@ -388,6 +388,8 @@ static void pxa2xx_timer_save(QEMUFile *f, void *opaque)qemu_put_be32s (f, &s->irq_enabled);qemu_put_be32s (f, &s->reset3);qemu_put_be32s (f, &s->snapshot); + +return 0 ; }static int pxa2xx_timer_load (QEMUFile *f,void *opaque,int version_id)
hw/rc4030.c +3 -1
@@ -650,7 +650,7 @@ static int rc4030_load(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static void rc4030_save (QEMUFile *f,void *opaque) +static int rc4030_save (QEMUFile *f,void *opaque) {rc4030State * s = opaque;int i, j;
@@ -675,6 +675,8 @@ static void rc4030_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->imr_jazz);qemu_put_be32 (f, s->isr_jazz);qemu_put_be32 (f, s->itr); + +return 0 ; }void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write)
hw/spitz.c +10 -4
@@ -130,12 +130,14 @@ static void sl_writeb(void *opaque, target_phys_addr_t addr, } } -static void sl_save (QEMUFile *f,void *opaque) +static int sl_save (QEMUFile *f,void *opaque) {SLNANDState *s = (SLNANDState *) opaque;qemu_put_8s (f, &s->ctl);ecc_put (f, &s->ecc); + +return 0 ; }static int sl_load (QEMUFile *f,void *opaque,int version_id)
@@ -447,7 +449,7 @@ static void spitz_keyboard_pre_map(SpitzKeyboardState *s)#undef CTRL#undef FN -static void spitz_keyboard_save (QEMUFile *f,void *opaque) +static int spitz_keyboard_save (QEMUFile *f,void *opaque) {SpitzKeyboardState *s = (SpitzKeyboardState *) opaque;int i;
@@ -456,6 +458,8 @@ static void spitz_keyboard_save(QEMUFile *f, void *opaque)qemu_put_be16s (f, &s->strobe_state);for (i =0 ; i <5 ; i ++)qemu_put_byte (f, spitz_gpio_invert[i]); + +return 0 ; }static int spitz_keyboard_load (QEMUFile *f,void *opaque,int version_id)
@@ -591,11 +595,12 @@ static uint32_t spitz_lcdtg_transfer(SSISlave *dev, uint32_t value)return 0 ; } -static void spitz_lcdtg_save (QEMUFile *f,void *opaque) +static int spitz_lcdtg_save (QEMUFile *f,void *opaque) {SpitzLCDTG *s = (SpitzLCDTG *)opaque;qemu_put_be32 (f, s->bl_intensity);qemu_put_be32 (f, s->bl_power); +return 0 ; }static int spitz_lcdtg_load (QEMUFile *f,void *opaque,int version_id)
@@ -676,7 +681,7 @@ static void spitz_adc_temp_on(void *opaque, int line, int level)max111x_set_input (max1111,MAX1111_BATT_TEMP ,0 ); } -static void spitz_ssp_save (QEMUFile *f,void *opaque) +static int spitz_ssp_save (QEMUFile *f,void *opaque) {CorgiSSPState *s = (CorgiSSPState *)opaque;int i;
@@ -684,6 +689,7 @@ static void spitz_ssp_save(QEMUFile *f, void *opaque)for (i =0 ; i <3 ; i++) {qemu_put_be32 (f, s->enable[i]); } +return 0 ; }static int spitz_ssp_load (QEMUFile *f,void *opaque,int version_id)
hw/ssd0323.c +3 -1
@@ -275,7 +275,7 @@ static void ssd0323_cd(void *opaque, int n, int level) s->mode = level ?SSD0323_DATA :SSD0323_CMD ; } -static void ssd0323_save (QEMUFile *f,void *opaque) +static int ssd0323_save (QEMUFile *f,void *opaque) {ssd0323_state *s = (ssd0323_state *)opaque;int i;
@@ -294,6 +294,8 @@ static void ssd0323_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->remap);qemu_put_be32 (f, s->mode);qemu_put_buffer (f, s->framebuffer,sizeof (s->framebuffer)); + +return 0 ; }static int ssd0323_load (QEMUFile *f,void *opaque,int version_id)
hw/ssi-sd.c +3 -1
@@ -191,7 +191,7 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t val)return 0xff ; } -static void ssi_sd_save (QEMUFile *f,void *opaque) +static int ssi_sd_save (QEMUFile *f,void *opaque) {ssi_sd_state *s = (ssi_sd_state *)opaque;int i;
@@ -205,6 +205,8 @@ static void ssi_sd_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->arglen);qemu_put_be32 (f, s->response_pos);qemu_put_be32 (f, s->stopping); + +return 0 ; }static int ssi_sd_load (QEMUFile *f,void *opaque,int version_id)
hw/stellaris.c +15 -5
@@ -280,7 +280,7 @@ static CPUWriteMemoryFunc * const gptm_writefn[] = { gptm_write }; -static void gptm_save (QEMUFile *f,void *opaque) +static int gptm_save (QEMUFile *f,void *opaque) {gptm_state *s = (gptm_state *)opaque;
@@ -305,6 +305,8 @@ static void gptm_save(QEMUFile *f, void *opaque)qemu_put_be64 (f, s->tick[1 ]);qemu_put_timer (f, s->timer[0 ]);qemu_put_timer (f, s->timer[1 ]); + +return 0 ; }static int gptm_load (QEMUFile *f,void *opaque,int version_id)
@@ -604,7 +606,7 @@ static void ssys_reset(void *opaque) s->dcgc[0 ] =1 ; } -static void ssys_save (QEMUFile *f,void *opaque) +static int ssys_save (QEMUFile *f,void *opaque) {ssys_state *s = (ssys_state *)opaque;
@@ -625,6 +627,8 @@ static void ssys_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->dcgc[2 ]);qemu_put_be32 (f, s->clkvclr);qemu_put_be32 (f, s->ldoarst); + +return 0 ; }static int ssys_load (QEMUFile *f,void *opaque,int version_id)
@@ -842,7 +846,7 @@ static CPUWriteMemoryFunc * const stellaris_i2c_writefn[] = { stellaris_i2c_write }; -static void stellaris_i2c_save (QEMUFile *f,void *opaque) +static int stellaris_i2c_save (QEMUFile *f,void *opaque) {stellaris_i2c_state *s = (stellaris_i2c_state *)opaque;
@@ -853,6 +857,8 @@ static void stellaris_i2c_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->mimr);qemu_put_be32 (f, s->mris);qemu_put_be32 (f, s->mcr); + +return 0 ; }static int stellaris_i2c_load (QEMUFile *f,void *opaque,int version_id)
@@ -1127,7 +1133,7 @@ static CPUWriteMemoryFunc * const stellaris_adc_writefn[] = { stellaris_adc_write }; -static void stellaris_adc_save (QEMUFile *f,void *opaque) +static int stellaris_adc_save (QEMUFile *f,void *opaque) {stellaris_adc_state *s = (stellaris_adc_state *)opaque;int i;
@@ -1150,6 +1156,8 @@ static void stellaris_adc_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->ssctl[i]); }qemu_put_be32 (f, s->noise); + +return 0 ; }static int stellaris_adc_load (QEMUFile *f,void *opaque,int version_id)
@@ -1230,11 +1238,13 @@ static uint32_t stellaris_ssi_bus_transfer(SSISlave *dev, uint32_t val)return ssi_transfer (s->bus[s->current_dev], val); } -static void stellaris_ssi_bus_save (QEMUFile *f,void *opaque) +static int stellaris_ssi_bus_save (QEMUFile *f,void *opaque) {stellaris_ssi_bus_state *s = (stellaris_ssi_bus_state *)opaque;qemu_put_be32 (f, s->current_dev); + +return 0 ; }static int stellaris_ssi_bus_load (QEMUFile *f,void *opaque,int version_id)
hw/stellaris_enet.c +3 -1
@@ -324,7 +324,7 @@ static void stellaris_enet_reset(stellaris_enet_state *s) s->tx_frame_len =-1 ; } -static void stellaris_enet_save (QEMUFile *f,void *opaque) +static int stellaris_enet_save (QEMUFile *f,void *opaque) {stellaris_enet_state *s = (stellaris_enet_state *)opaque;int i;
@@ -350,6 +350,8 @@ static void stellaris_enet_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->next_packet);qemu_put_be32 (f, s->rx_fifo - s->rx[s->next_packet].data);qemu_put_be32 (f, s->rx_fifo_len); + +return 0 ; }static int stellaris_enet_load (QEMUFile *f,void *opaque,int version_id)
hw/stellaris_input.c +3 -1
@@ -47,7 +47,7 @@ static void stellaris_gamepad_put_key(void * opaque, int keycode) s->extension =0 ; } -static void stellaris_gamepad_save (QEMUFile *f,void *opaque) +static int stellaris_gamepad_save (QEMUFile *f,void *opaque) {gamepad_state *s = (gamepad_state *)opaque;int i;
@@ -55,6 +55,8 @@ static void stellaris_gamepad_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->extension);for (i =0 ; i < s->num_buttons; i++)qemu_put_byte (f, s->buttons[i].pressed); + +return 0 ; }static int stellaris_gamepad_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_fb.c +3 -1
@@ -457,7 +457,7 @@ static CPUWriteMemoryFunc * const syborg_fb_writefn[] = { syborg_fb_write }; -static void syborg_fb_save (QEMUFile *f,void *opaque) +static int syborg_fb_save (QEMUFile *f,void *opaque) {SyborgFBState *s = opaque;int i;
@@ -475,6 +475,8 @@ static void syborg_fb_save(QEMUFile *f, void *opaque)for (i =0 ; i <256 ; i++) {qemu_put_be32 (f, s->raw_palette[i]); } + +return 0 ; }static int syborg_fb_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_interrupt.c +2 -1
@@ -168,7 +168,7 @@ static CPUWriteMemoryFunc * const syborg_int_writefn[] = { syborg_int_write }; -static void syborg_int_save (QEMUFile *f,void *opaque) +static int syborg_int_save (QEMUFile *f,void *opaque) {SyborgIntState *s = (SyborgIntState *)opaque;int i;
@@ -179,6 +179,7 @@ static void syborg_int_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->flags[i].enabled | ((unsigned )s->flags[i].level <<1 )); } +return 0 ; }static int syborg_int_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_keyboard.c +2 -1
@@ -165,7 +165,7 @@ static void syborg_keyboard_event(void *opaque, int keycode)syborg_keyboard_update (s); } -static void syborg_keyboard_save (QEMUFile *f,void *opaque) +static int syborg_keyboard_save (QEMUFile *f,void *opaque) {SyborgKeyboardState *s = (SyborgKeyboardState *)opaque;int i;
@@ -178,6 +178,7 @@ static void syborg_keyboard_save(QEMUFile *f, void *opaque)for (i =0 ; i < s->fifo_size; i++) {qemu_put_be32 (f, s->key_fifo[i]); } +return 0 ; }static int syborg_keyboard_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_pointer.c +2 -1
@@ -152,7 +152,7 @@ static void syborg_pointer_event(void *opaque, int dx, int dy, int dz,syborg_pointer_update (s); } -static void syborg_pointer_save (QEMUFile *f,void *opaque) +static int syborg_pointer_save (QEMUFile *f,void *opaque) {SyborgPointerState *s = (SyborgPointerState *)opaque;int i;
@@ -168,6 +168,7 @@ static void syborg_pointer_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->event_fifo[i].z);qemu_put_be32 (f, s->event_fifo[i].pointer_buttons); } +return 0 ; }static int syborg_pointer_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_rtc.c +3 -1
@@ -102,12 +102,14 @@ static CPUWriteMemoryFunc * const syborg_rtc_writefn[] = { syborg_rtc_write }; -static void syborg_rtc_save (QEMUFile *f,void *opaque) +static int syborg_rtc_save (QEMUFile *f,void *opaque) {SyborgRTCState *s = opaque;qemu_put_be64 (f, s->offset);qemu_put_be64 (f, s->data); + +return 0 ; }static int syborg_rtc_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_serial.c +3 -1
@@ -273,7 +273,7 @@ static CPUWriteMemoryFunc * const syborg_serial_writefn[] = { syborg_serial_write }; -static void syborg_serial_save (QEMUFile *f,void *opaque) +static int syborg_serial_save (QEMUFile *f,void *opaque) {SyborgSerialState *s = opaque;int i;
@@ -288,6 +288,8 @@ static void syborg_serial_save(QEMUFile *f, void *opaque)for (i =0 ; i < s->fifo_size; i++) {qemu_put_be32 (f, s->read_fifo[i]); } + +return 0 ; }static int syborg_serial_load (QEMUFile *f,void *opaque,int version_id)
hw/syborg_timer.c +3 -1
@@ -174,7 +174,7 @@ static CPUWriteMemoryFunc * const syborg_timer_writefn[] = { syborg_timer_write }; -static void syborg_timer_save (QEMUFile *f,void *opaque) +static int syborg_timer_save (QEMUFile *f,void *opaque) {SyborgTimerState *s = opaque;
@@ -184,6 +184,8 @@ static void syborg_timer_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->int_level);qemu_put_be32 (f, s->int_enabled);qemu_put_ptimer (f, s->timer); + +return 0 ; }static int syborg_timer_load (QEMUFile *f,void *opaque,int version_id)
hw/tsc2005.c +3 -1
@@ -432,7 +432,7 @@ static void tsc2005_touchscreen_event(void *opaque,tsc2005_pin_update (s); } -static void tsc2005_save (QEMUFile *f,void *opaque) +static int tsc2005_save (QEMUFile *f,void *opaque) {TSC2005State *s = (TSC2005State *) opaque;int i;
@@ -471,6 +471,8 @@ static void tsc2005_save(QEMUFile *f, void *opaque)for (i =0 ; i <8 ; i ++)qemu_put_be32 (f, s->tr[i]); + +return 0 ; }static int tsc2005_load (QEMUFile *f,void *opaque,int version_id)
hw/tsc210x.c +3 -1
@@ -1002,7 +1002,7 @@ static void tsc210x_i2s_set_rate(TSC210xState *s, int in, int out) s->i2s_rx_rate = in; } -static void tsc210x_save (QEMUFile *f,void *opaque) +static int tsc210x_save (QEMUFile *f,void *opaque) {TSC210xState *s = (TSC210xState *) opaque;int64_t now =qemu_get_clock (vm_clock);
@@ -1046,6 +1046,8 @@ static void tsc210x_save(QEMUFile *f, void *opaque)for (i =0 ; i <0x14 ; i ++)qemu_put_be16s (f, &s->filter_data[i]); + +return 0 ; }static int tsc210x_load (QEMUFile *f,void *opaque,int version_id)
hw/unin_pci.c +3 -1
@@ -63,11 +63,13 @@ static void pci_unin_set_irq(void *opaque, int irq_num, int level)qemu_set_irq (pic[unin_irq_line[irq_num]], level); } -static void pci_unin_save (QEMUFile * f,void *opaque) +static int pci_unin_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque;pci_device_save (d, f); + +return 0 ; }static int pci_unin_load (QEMUFile * f,void *opaque,int version_id)
hw/virtio-balloon.c +2 -1
@@ -233,7 +233,7 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target, } } -static void virtio_balloon_save (QEMUFile *f,void *opaque) +static int virtio_balloon_save (QEMUFile *f,void *opaque) {VirtIOBalloon *s = opaque;
@@ -241,6 +241,7 @@ static void virtio_balloon_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, s->num_pages);qemu_put_be32 (f, s->actual); +return 0 ; }static int virtio_balloon_load (QEMUFile *f,void *opaque,int version_id)
hw/virtio-blk.c +3 -1
@@ -466,7 +466,7 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features)return features; } -static void virtio_blk_save (QEMUFile *f,void *opaque) +static int virtio_blk_save (QEMUFile *f,void *opaque) {VirtIOBlock *s = opaque;VirtIOBlockReq *req = s->rq;
@@ -479,6 +479,8 @@ static void virtio_blk_save(QEMUFile *f, void *opaque) req = req->next; }qemu_put_sbyte (f,0 ); + +return 0 ; }static int virtio_blk_load (QEMUFile *f,void *opaque,int version_id)
hw/virtio-net.c +3 -1
@@ -810,7 +810,7 @@ static void virtio_net_tx_bh(void *opaque) } } -static void virtio_net_save (QEMUFile *f,void *opaque) +static int virtio_net_save (QEMUFile *f,void *opaque) {VirtIONet *n = opaque;
@@ -836,6 +836,8 @@ static void virtio_net_save(QEMUFile *f, void *opaque)qemu_put_byte (f, n->nouni);qemu_put_byte (f, n->nobcast);qemu_put_byte (f, n->has_ufo); + +return 0 ; }static int virtio_net_load (QEMUFile *f,void *opaque,int version_id)
hw/virtio-serial-bus.c +3 -1
@@ -453,7 +453,7 @@ static void set_config(VirtIODevice *vdev, const uint8_t *config_data)memcpy (&config, config_data,sizeof (config)); } -static void virtio_serial_save (QEMUFile *f,void *opaque) +static int virtio_serial_save (QEMUFile *f,void *opaque) {VirtIOSerial *s = opaque;VirtIOSerialPort *port;
@@ -492,6 +492,8 @@ static void virtio_serial_save(QEMUFile *f, void *opaque)qemu_put_byte (f, port->guest_connected);qemu_put_byte (f, port->host_connected); } + +return 0 ; }static int virtio_serial_load (QEMUFile *f,void *opaque,int version_id)
hw/zaurus.c +3 -1
@@ -178,7 +178,7 @@ void scoop_gpio_out_set(ScoopInfo *s, int line, s->handler[line] = handler; } -static void scoop_save (QEMUFile *f,void *opaque) +static int scoop_save (QEMUFile *f,void *opaque) {ScoopInfo *s = (ScoopInfo *) opaque;qemu_put_be16s (f, &s->status);
@@ -192,6 +192,8 @@ static void scoop_save(QEMUFile *f, void *opaque)qemu_put_be16s (f, &s->irr);qemu_put_be16s (f, &s->imr);qemu_put_be16s (f, &s->isr); + +return 0 ; }static int scoop_load (QEMUFile *f,void *opaque,int version_id)
qemu-common.h +1 -1
@@ -263,7 +263,7 @@ typedef enum {void cpu_exec_init_all (unsigned long tb_size);/* CPU save/load. */ -void cpu_save (QEMUFile *f,void *opaque); +int cpu_save (QEMUFile *f,void *opaque);int cpu_load (QEMUFile *f,void *opaque,int version_id);/* Force QEMU to stop what it's doing and service IO */
savevm.c +1 -2
@@ -1408,8 +1408,7 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se) }if (!se->vmsd) {/* Old style */ - se->save_state (f, se->opaque); -return 0 ; +return se->save_state (f, se->opaque); }vmstate_save_state (f,se->vmsd, se->opaque);
slirp/slirp.c +4 -2
@@ -193,7 +193,7 @@ static void slirp_init_once(void) loopback_addr.s_addr =htonl (INADDR_LOOPBACK ); } -static void slirp_state_save (QEMUFile *f,void *opaque); +static int slirp_state_save (QEMUFile *f,void *opaque);static int slirp_state_load (QEMUFile *f,void *opaque,int version_id); Slirp *slirp_init(int restricted, struct in_addr vnetwork,
@@ -940,7 +940,7 @@ static void slirp_bootp_save(QEMUFile *f, Slirp *slirp) } } -static void slirp_state_save (QEMUFile *f,void *opaque) +static int slirp_state_save (QEMUFile *f,void *opaque) {Slirp *slirp = opaque;struct ex_list *ex_ptr;
@@ -961,6 +961,8 @@ static void slirp_state_save(QEMUFile *f, void *opaque)qemu_put_be16 (f, slirp->ip_id);slirp_bootp_save (f, slirp); + +return 0 ; }static void slirp_tcp_load (QEMUFile *f,struct tcpcb *tp)
target-arm/machine.c +2 -1
@@ -1,7 +1,7 @@#include "hw/hw.h" #include "hw/boards.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {int i;CPUARMState *env = (CPUARMState *)opaque;
@@ -99,6 +99,7 @@ void cpu_save(QEMUFile *f, void *opaque)qemu_put_be32 (f, env->teecr);qemu_put_be32 (f, env->teehbr); } +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-cris/machine.c +2 -1
@@ -1,7 +1,7 @@#include "hw/hw.h" #include "hw/boards.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {CPUCRISState *env = opaque;int i;
@@ -42,6 +42,7 @@ void cpu_save(QEMUFile *f, void *opaque) } } } +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-i386/machine.c +2 -1
@@ -478,9 +478,10 @@ static const VMStateDescription vmstate_cpu = { } }; -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {vmstate_save_state (f, &vmstate_cpu, opaque); +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-microblaze/machine.c +2 -1
@@ -1,8 +1,9 @@#include "hw/hw.h" #include "hw/boards.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) { +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-mips/machine.c +2 -1
@@ -40,7 +40,7 @@ static void save_fpu(QEMUFile *f, CPUMIPSFPUContext *fpu)qemu_put_be32s (f, &fpu->fcr31); } -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {CPUState *env = opaque;int i;
@@ -149,6 +149,7 @@ void cpu_save(QEMUFile *f, void *opaque)save_tc (f, &env->tcs[i]);for (i =0 ; i <MIPS_FPU_MAX ; i++)save_fpu (f, &env->fpus[i]); +return 0 ; }static void load_tc (QEMUFile *f,TCState *tc)
target-ppc/machine.c +2 -1
@@ -2,7 +2,7 @@#include "hw/boards.h" #include "kvm.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {CPUState *env = (CPUState *)opaque;unsigned int i, j;
@@ -87,6 +87,7 @@ void cpu_save(QEMUFile *f, void *opaque)qemu_put_betls (f, &env->hflags_nmsr);qemu_put_sbe32s (f, &env->mmu_idx);qemu_put_sbe32s (f, &env->power_mode); +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-s390x/machine.c +2 -1
@@ -20,8 +20,9 @@#include "hw/hw.h" #include "hw/boards.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) { +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
target-sparc/machine.c +2 -1
@@ -4,7 +4,7 @@#include "exec-all.h" -void cpu_save (QEMUFile *f,void *opaque) +int cpu_save (QEMUFile *f,void *opaque) {CPUState *env = opaque;int i;
@@ -98,6 +98,7 @@ void cpu_save(QEMUFile *f, void *opaque)qemu_put_be64s (f, &env->ssr);cpu_put_timer (f, env->hstick);#endif +return 0 ; }int cpu_load (QEMUFile *f,void *opaque,int version_id)
PATCH RESEND 2/6 savevm: Allow vmsd->pre_save to return error
In reply to Alex WilliamsonThis allows vmsd based saves to also have a way to signal that they can't be saved or migrated.
---
hw/fdc.c | 3 ++- hw/hpet.c | 3 ++- hw/hw.h | 6 +++--- hw/i2c.c | 3 ++- hw/ide/core.c | 4 +++- hw/lsi53c895a.c | 4 +++- hw/rtl8139.c | 4 +++- hw/serial.c | 3 ++- hw/twl92230.c | 3 ++- hw/usb-uhci.c | 3 ++- hw/wm8750.c | 3 ++- savevm.c | 36 +++++++++++++++++++++++------------- target-i386/machine.c | 6 +++--- 13 files changed, 52 insertions(+), 29 deletions(-)
hw/fdc.c +2 -1
@@ -643,11 +643,12 @@ static const VMStateDescription vmstate_fdrive = { } }; -static void fdc_pre_save (void *opaque) +static int fdc_pre_save (void *opaque) {FDCtrl *s = opaque; s->dor_vmstate = s->dor |GET_CUR_DRV (s); +return 0 ; }static int fdc_post_load (void *opaque,int version_id)
hw/hpet.c +2 -1
@@ -204,12 +204,13 @@ static void update_irq(struct HPETTimer *timer, int set) } } -static void hpet_pre_save (void *opaque) +static int hpet_pre_save (void *opaque) {HPETState *s = opaque;/* save current counter value */ s->hpet_counter =hpet_get_ticks (s); +return 0 ; }static int hpet_pre_load (void *opaque)
hw/hw.h +3 -3
@@ -328,7 +328,7 @@ struct VMStateDescription {LoadStateHandler *load_state_old;int (*pre_load)(void *opaque);int (*post_load)(void *opaque,int version_id); -void (*pre_save)(void *opaque); +int (*pre_save)(void *opaque);VMStateField *fields;const VMStateSubsection *subsections; };
@@ -787,8 +787,8 @@ extern const VMStateDescription vmstate_i2c_slave;extern int vmstate_load_state (QEMUFile *f,const VMStateDescription *vmsd,void *opaque,int version_id); -extern void vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque); +extern int vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, +void *opaque);extern int vmstate_register (DeviceState *dev,int instance_id,const VMStateDescription *vmsd,void *base); extern int vmstate_register_with_alias_id(DeviceState *dev,
hw/i2c.c +2 -1
@@ -26,11 +26,12 @@ static struct BusInfo i2c_bus_info = { } }; -static void i2c_bus_pre_save (void *opaque) +static int i2c_bus_pre_save (void *opaque) {i2c_bus *bus = opaque; bus->saved_address = bus->current_dev ? bus->current_dev->address :-1 ; +return 0 ; }static int i2c_bus_post_load (void *opaque,int version_id)
hw/ide/core.c +3 -1
@@ -2812,7 +2812,7 @@ static int ide_drive_pio_post_load(void *opaque, int version_id)return 0 ; } -static void ide_drive_pio_pre_save (void *opaque) +static int ide_drive_pio_pre_save (void *opaque) {IDEState *s = opaque;int idx;
@@ -2828,6 +2828,8 @@ static void ide_drive_pio_pre_save(void *opaque) }else { s->end_transfer_fn_idx = idx; } + +return 0 ; }static bool ide_drive_pio_state_needed (void *opaque)
hw/lsi53c895a.c +3 -1
@@ -2046,7 +2046,7 @@ static void lsi_scsi_reset(DeviceState *dev)lsi_soft_reset (s); } -static void lsi_pre_save (void *opaque) +static int lsi_pre_save (void *opaque) {LSIState *s = opaque;
@@ -2055,6 +2055,8 @@ static void lsi_pre_save(void *opaque)assert (s->current->dma_len ==0 ); }assert (QTAILQ_EMPTY (&s->queue)); + +return 0 ; }static const VMStateDescription vmstate_lsi_scsi = {
hw/rtl8139.c +3 -1
@@ -3173,7 +3173,7 @@ static int rtl8139_post_load(void *opaque, int version_id)return 0 ; } -static void rtl8139_pre_save (void *opaque) +static int rtl8139_pre_save (void *opaque) {RTL8139State * s = opaque;int64_t current_time =qemu_get_clock (vm_clock);
@@ -3182,6 +3182,8 @@ static void rtl8139_pre_save(void *opaque)rtl8139_set_next_tctr_time (s, current_time); s->TCTR =muldiv64 (current_time - s->TCTR_base,PCI_FREQUENCY ,get_ticks_per_sec ()); + +return 0 ; }static const VMStateDescription vmstate_rtl8139 = {
hw/serial.c +2 -1
@@ -659,10 +659,11 @@ static void serial_event(void *opaque, int event)serial_receive_break (s); } -static void serial_pre_save (void *opaque) +static int serial_pre_save (void *opaque) {SerialState *s = opaque; s->fcr_vmstate = s->fcr; +return 0 ; }static int serial_post_load (void *opaque,int version_id)
hw/twl92230.c +2 -1
@@ -782,11 +782,12 @@ static const VMStateDescription vmstate_menelaus_tm = { } }; -static void menelaus_pre_save (void *opaque) +static int menelaus_pre_save (void *opaque) {MenelausState *s = opaque;/* Should be <= 1000 */ s->rtc_next_vmstate = s->rtc.next -qemu_get_clock (rt_clock); +return 0 ; }static int menelaus_post_load (void *opaque,int version_id)
hw/usb-uhci.c +2 -1
@@ -355,11 +355,12 @@ static void uhci_reset(void *opaque)uhci_async_cancel_all (s); } -static void uhci_pre_save (void *opaque) +static int uhci_pre_save (void *opaque) {UHCIState *s = opaque;uhci_async_cancel_all (s); +return 0 ; }static const VMStateDescription vmstate_uhci_port = {
hw/wm8750.c +2 -1
@@ -559,11 +559,12 @@ static int wm8750_rx(i2c_slave *i2c)return 0x00 ; } -static void wm8750_pre_save (void *opaque) +static int wm8750_pre_save (void *opaque) {WM8750State *s = opaque; s->rate_vmstate = (s->rate - wm_rate_table) /sizeof (*s->rate); +return 0 ; }static int wm8750_post_load (void *opaque,int version_id)
savevm.c +23 -13
@@ -1265,8 +1265,8 @@ void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, } } -static void vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque); +static int vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, +void *opaque);static int vmstate_subsection_load (QEMUFile *f,const VMStateDescription *vmsd,void *opaque);
@@ -1344,13 +1344,17 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,return 0 ; } -void vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque) +int vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, +void *opaque) {VMStateField *field = vmsd->fields; +int ret;if (vmsd->pre_save) { - vmsd->pre_save (opaque); + ret = vmsd->pre_save (opaque); +if (ret <0 ) { +return ret; + } }while (field->name) { if (!field->field_exists ||
@@ -1382,7 +1386,10 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, addr = *(void **)addr; }if (field->flags &VMS_STRUCT ) { -vmstate_save_state (f, field->vmsd, addr); + ret =vmstate_save_state (f, field->vmsd, addr); +if (ret <0 ) { +return ret; + } }else { field->info->put (f, addr, size); }
@@ -1390,7 +1397,7 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, } field++; } -vmstate_subsection_save (f, vmsd, opaque); +return vmstate_subsection_save (f, vmsd, opaque); }static int vmstate_load (QEMUFile *f,SaveStateEntry *se,int version_id)
@@ -1410,9 +1417,7 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se)if (!se->vmsd) {/* Old style */ return se->save_state (f, se->opaque); } -vmstate_save_state (f,se->vmsd, se->opaque); - -return 0 ; +return vmstate_save_state (f, se->vmsd, se->opaque); }#define QEMU_VM_FILE_MAGIC 0x5145564d
@@ -1656,8 +1661,8 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,return 0 ; } -static void vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque) +static int vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, +void *opaque) {const VMStateSubsection *sub = vmsd->subsections;
@@ -1665,16 +1670,21 @@ static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,if (sub->needed (opaque)) {const VMStateDescription *vmsd = sub->vmsd;uint8_t len; +int ret;qemu_put_byte (f,QEMU_VM_SUBSECTION ); len =strlen (vmsd->name);qemu_put_byte (f, len);qemu_put_buffer (f, (uint8_t *)vmsd->name, len);qemu_put_be32 (f, vmsd->version_id); -vmstate_save_state (f, vmsd, opaque); + ret =vmstate_save_state (f, vmsd, opaque); +if (ret <0 ) { +return ret; + } } sub++; } +return 0 ; } typedef struct LoadStateEntry {
target-i386/machine.c +3 -3
@@ -332,7 +332,7 @@ static const VMStateInfo vmstate_hack_uint64_as_uint32 = { VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_hack_uint64_as_uint32, uint64_t)#endif -static void cpu_pre_save (void *opaque) +static int cpu_pre_save (void *opaque) {CPUState *env = opaque;int i;
@@ -349,6 +349,7 @@ static void cpu_pre_save(void *opaque)#else env->fpregs_format_vmstate =1 ;#endif +return 0 ; }static int cpu_post_load (void *opaque,int version_id)
@@ -480,8 +481,7 @@ static const VMStateDescription vmstate_cpu = {int cpu_save (QEMUFile *f,void *opaque) { -vmstate_save_state (f, &vmstate_cpu, opaque); -return 0 ; +return vmstate_save_state (f, &vmstate_cpu, opaque); }int cpu_load (QEMUFile *f,void *opaque,int version_id)
PATCH RESEND 3/6 pci: Allow pci_device_save() to return error
In reply to Alex WilliamsonCarry the vmsd pre_save error reporting through pci_device_save().
---
hw/grackle_pci.c | 4 +--- hw/gt64xxx.c | 3 +-- hw/ivshmem.c | 7 ++++++- hw/openpic.c | 4 +--- hw/pci.c | 9 +++++++-- hw/pci.h | 2 +- hw/piix4.c | 3 +-- hw/ppc4xx_pci.c | 7 +++++-- hw/ppce500_pci.c | 7 +++++-- hw/unin_pci.c | 4 +--- 10 files changed, 29 insertions(+), 21 deletions(-)
hw/grackle_pci.c +1 -3
@@ -61,9 +61,7 @@ static int pci_grackle_save(QEMUFile* f, void *opaque) {PCIDevice *d = opaque; -pci_device_save (d, f); - -return 0 ; +return pci_device_save (d, f); }static int pci_grackle_load (QEMUFile * f,void *opaque,int version_id)
hw/gt64xxx.c +1 -2
@@ -1089,8 +1089,7 @@ static void gt64120_reset(void *opaque)static int gt64120_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque; -pci_device_save (d, f); -return 0 ; +return pci_device_save (d, f); }static int gt64120_load (QEMUFile * f,void *opaque,int version_id)
hw/ivshmem.c +6 -1
@@ -619,9 +619,14 @@ static void ivshmem_setup_msi(IVShmemState * s) {static int ivshmem_save (QEMUFile * f,void *opaque) {IVShmemState *proxy = opaque; +int ret;IVSHMEM_DPRINTF ("ivshmem_save\n" ); -pci_device_save (&proxy->dev, f); + + ret =pci_device_save (&proxy->dev, f); +if (ret <0 ) { +return ret; + }if (ivshmem_has_feature (proxy,IVSHMEM_MSI )) {msix_save (&proxy->dev, f);
hw/openpic.c +1 -3
@@ -1102,9 +1102,7 @@ static int openpic_save(QEMUFile* f, void *opaque) }#endif -pci_device_save (&opp->pci_dev, f); - -return 0 ; +return pci_device_save (&opp->pci_dev, f); }static void openpic_load_IRQ_queue (QEMUFile * f,IRQ_queue_t *q)
hw/pci.c +7 -2
@@ -398,16 +398,21 @@ static inline const VMStateDescription *pci_get_vmstate(PCIDevice *s)return pci_is_express (s) ? &vmstate_pcie_device : &vmstate_pci_device; } -void pci_device_save (PCIDevice *s,QEMUFile *f) +int pci_device_save (PCIDevice *s,QEMUFile *f) { +int ret;/* Clear interrupt status bit: it is implicit * in irq_state which we are saving. * This makes us compatible with old devices * which never set or clear this bit. */ s->config[PCI_STATUS ] &= ~PCI_STATUS_INTERRUPT ; -vmstate_save_state (f,pci_get_vmstate (s), s); + ret =vmstate_save_state (f,pci_get_vmstate (s), s); +if (ret <0 ) { +return ret; + }/* Restore the interrupt status bit. */ pci_update_irq_status (s); +return 0 ; }int pci_device_load (PCIDevice *s,QEMUFile *f)
hw/pci.h +1 -1
@@ -209,7 +209,7 @@ uint32_t pci_default_read_config(PCIDevice *d, uint32_t address, int len);void pci_default_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len); -void pci_device_save (PCIDevice *s,QEMUFile *f); +int pci_device_save (PCIDevice *s,QEMUFile *f);int pci_device_load (PCIDevice *s,QEMUFile *f);typedef void (*pci_set_irq_fn )(void *opaque,int irq_num,int level);
hw/piix4.c +1 -2
@@ -71,8 +71,7 @@ static void piix4_reset(void *opaque)static int piix_save (QEMUFile * f,void *opaque) {PCIDevice *d = opaque; -pci_device_save (d, f); -return 0 ; +return pci_device_save (d, f); }static int piix_load (QEMUFile * f,void *opaque,int version_id)
hw/ppc4xx_pci.c +5 -2
@@ -301,9 +301,12 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_num, int level)static int ppc4xx_pci_save (QEMUFile *f,void *opaque) {PPC4xxPCIState *controller = opaque; -int i; +int i, ret; -pci_device_save (controller->pci_dev, f); + ret =pci_device_save (controller->pci_dev, f); +if (ret <0 ) { +return ret; + }for (i =0 ; i < PPC4xx_PCI_NR_PMMS; i++) {qemu_put_be32s (f, &controller->pmm[i].la);
hw/ppce500_pci.c +5 -2
@@ -219,9 +219,12 @@ static void mpc85xx_pci_set_irq(void *opaque, int irq_num, int level)static int ppce500_pci_save (QEMUFile *f,void *opaque) {PPCE500PCIState *controller = opaque; -int i; +int i, ret; -pci_device_save (controller->pci_dev, f); + ret =pci_device_save (controller->pci_dev, f); +if (ret <0 ) { +return ret; + }for (i =0 ; i <PPCE500_PCI_NR_POBS ; i++) {qemu_put_be32s (f, &controller->pob[i].potar);
hw/unin_pci.c +1 -3
@@ -67,9 +67,7 @@ static int pci_unin_save(QEMUFile* f, void *opaque) {PCIDevice *d = opaque; -pci_device_save (d, f); - -return 0 ; +return pci_device_save (d, f); }static int pci_unin_load (QEMUFile * f,void *opaque,int version_id)
PATCH RESEND 4/6 virtio: Allow virtio_save() errors
In reply to Alex WilliamsonCarry pci_device_save() error through to virtio_save().
---
hw/virtio-balloon.c | 6 +++++- hw/virtio-blk.c | 6 +++++- hw/virtio-net.c | 6 +++++- hw/virtio-pci.c | 10 ++++++++-- hw/virtio-serial-bus.c | 6 +++++- hw/virtio.c | 14 ++++++++++---- hw/virtio.h | 4 ++-- 7 files changed, 40 insertions(+), 12 deletions(-)
hw/virtio-balloon.c +5 -1
@@ -236,8 +236,12 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target,static int virtio_balloon_save (QEMUFile *f,void *opaque) {VirtIOBalloon *s = opaque; +int ret; -virtio_save (&s->vdev, f); + ret =virtio_save (&s->vdev, f); +if (ret <0 ) { +return ret; + }qemu_put_be32 (f, s->num_pages);qemu_put_be32 (f, s->actual);
hw/virtio-blk.c +5 -1
@@ -470,8 +470,12 @@ static int virtio_blk_save(QEMUFile *f, void *opaque) {VirtIOBlock *s = opaque;VirtIOBlockReq *req = s->rq; +int ret; -virtio_save (&s->vdev, f); + ret =virtio_save (&s->vdev, f); +if (ret <0 ) { +return ret; + }while (req) {qemu_put_sbyte (f,1 );
hw/virtio-net.c +5 -1
@@ -813,11 +813,15 @@ static void virtio_net_tx_bh(void *opaque)static int virtio_net_save (QEMUFile *f,void *opaque) {VirtIONet *n = opaque; +int ret;/* At this point, backend must be stopped, otherwise * it might keep writing to memory. */ assert (!n->vhost_started); -virtio_save (&n->vdev, f); + ret =virtio_save (&n->vdev, f); +if (ret <0 ) { +return ret; + }qemu_put_buffer (f, n->mac,ETH_ALEN );qemu_put_be32 (f, n->tx_waiting);
hw/virtio-pci.c +8 -2
@@ -121,13 +121,19 @@ static void virtio_pci_notify(void *opaque, uint16_t vector)qemu_set_irq (proxy->pci_dev.irq[0 ], proxy->vdev->isr &1 ); } -static void virtio_pci_save_config (void * opaque,QEMUFile *f) +static int virtio_pci_save_config (void * opaque,QEMUFile *f) {VirtIOPCIProxy *proxy = opaque; -pci_device_save (&proxy->pci_dev, f); +int ret; + + ret =pci_device_save (&proxy->pci_dev, f); +if (ret <0 ) { +return ret; + }msix_save (&proxy->pci_dev, f);if (msix_present (&proxy->pci_dev))qemu_put_be16 (f, proxy->vdev->config_vector); +return 0 ; }static void virtio_pci_save_queue (void * opaque,int n,QEMUFile *f)
hw/virtio-serial-bus.c +5 -1
@@ -459,9 +459,13 @@ static int virtio_serial_save(QEMUFile *f, void *opaque)VirtIOSerialPort *port;uint32_t nr_active_ports;unsigned int i; +int ret;/* The virtio device */ -virtio_save (&s->vdev, f); + ret =virtio_save (&s->vdev, f); +if (ret <0 ) { +return ret; + }/* The config space */ qemu_put_be16s (f, &s->config.cols);
hw/virtio.c +10 -4
@@ -642,12 +642,16 @@ void virtio_notify_config(VirtIODevice *vdev)virtio_notify_vector (vdev, vdev->config_vector); } -void virtio_save (VirtIODevice *vdev,QEMUFile *f) +int virtio_save (VirtIODevice *vdev,QEMUFile *f) { -int i; +int i, ret; -if (vdev->binding->save_config) - vdev->binding->save_config (vdev->binding_opaque, f); +if (vdev->binding->save_config) { + ret = vdev->binding->save_config (vdev->binding_opaque, f); +if (ret <0 ) { +return ret; + } + }qemu_put_8s (f, &vdev->status);qemu_put_8s (f, &vdev->isr);
@@ -673,6 +677,8 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)if (vdev->binding->save_queue) vdev->binding->save_queue (vdev->binding_opaque, i, f); } + +return 0 ; }int virtio_load (VirtIODevice *vdev,QEMUFile *f)
hw/virtio.h +2 -2
@@ -88,7 +88,7 @@ typedef struct VirtQueueElement typedef struct { void (*notify)(void * opaque, uint16_t vector); - void (*save_config)(void * opaque, QEMUFile *f); + int (*save_config)(void * opaque, QEMUFile *f); void (*save_queue)(void * opaque, int n, QEMUFile *f); int (*load_config)(void * opaque, QEMUFile *f); int (*load_queue)(void * opaque, int n, QEMUFile *f);
@@ -150,7 +150,7 @@ int virtqueue_avail_bytes(VirtQueue *vq, int in_bytes, int out_bytes);void virtio_notify (VirtIODevice *vdev,VirtQueue *vq); -void virtio_save (VirtIODevice *vdev,QEMUFile *f); +int virtio_save (VirtIODevice *vdev,QEMUFile *f);int virtio_load (VirtIODevice *vdev,QEMUFile *f);
PATCH RESEND 5/6 savevm: Allow set_params and save_live_state to error
In reply to Alex WilliamsonThis lets a save state handler NAK a migration or cancel if it runs into problems.
---
block-migration.c | 4 +++- hw/hw.h | 2 +- savevm.c | 18 +++++++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)
block-migration.c +3 -1
@@ -628,13 +628,15 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static void block_set_params (int blk_enable,int shared_base,void *opaque) +static int block_set_params (int blk_enable,int shared_base,void *opaque) { block_mig_state.blk_enable = blk_enable; block_mig_state.shared_base = shared_base;/* shared base means that blk_enable = 1 */ block_mig_state.blk_enable |= shared_base; + +return 0 ; }void blk_mig_init (void )
hw/hw.h +1 -1
@@ -239,7 +239,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)int64_t qemu_ftell (QEMUFile *f);int64_t qemu_fseek (QEMUFile *f,int64_t pos,int whence); -typedef void SaveSetParamsHandler (int blk_enable,int shared,void * opaque); +typedef int SaveSetParamsHandler (int blk_enable,int shared,void * opaque);typedef int SaveStateHandler (QEMUFile *f,void *opaque);typedef int SaveLiveStateHandler (Monitor *mon,QEMUFile *f,int stage,void *opaque);
savevm.c +15 -3
@@ -1435,12 +1435,16 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int shared) {SaveStateEntry *se; +int ret; QTAILQ_FOREACH(se, &savevm_handlers, entry) {if (se->set_params ==NULL ) {continue ; } - se->set_params (blk_enable, shared, se->opaque); + ret = se->set_params (blk_enable, shared, se->opaque); +if (ret <0 ) { +return ret; + } }qemu_put_be32 (f,QEMU_VM_FILE_MAGIC );
@@ -1464,7 +1468,10 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,qemu_put_be32 (f, se->instance_id);qemu_put_be32 (f, se->version_id); - se->save_live_state (mon, f,QEMU_VM_SECTION_START , se->opaque); + ret = se->save_live_state (mon, f,QEMU_VM_SECTION_START , se->opaque); +if (ret <0 ) { +return ret; + } }if (qemu_file_has_error (f)) {
@@ -1495,6 +1502,8 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)and reduces the probability that a faster changing state is synchronized over and over again. */ break ; + }else if (ret <0 ) { +return ret; } }
@@ -1524,7 +1533,10 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)qemu_put_byte (f,QEMU_VM_SECTION_END );qemu_put_be32 (f, se->section_id); - se->save_live_state (mon, f,QEMU_VM_SECTION_END , se->opaque); + r = se->save_live_state (mon, f,QEMU_VM_SECTION_END , se->opaque); +if (r <0 ) { +return r; + } } QTAILQ_FOREACH(se, &savevm_handlers, entry) {
PATCH RESEND 6/6 savevm: Remove register_device_unmigratable()
In reply to Alex WilliamsonNow that the save state handlers can return error, individual drivers can cancel a migration if they hit an error or don't support it. This makes the unmigratable callback redundant. Remove it and change the only user to cancel the migration in a set_params callback, which actually happens much earlier in the migration than the unmigratable flag was checked.
---
hw/hw.h | 2 -- hw/ivshmem.c | 20 ++++++++++++++------ savevm.c | 31 ------------------------------- 3 files changed, 14 insertions(+), 39 deletions(-)
hw/hw.h +0 -2
@@ -264,8 +264,6 @@ int register_savevm_live(DeviceState *dev, void *opaque);void unregister_savevm (DeviceState *dev,const char *idstr,void *opaque); -void register_device_unmigratable (DeviceState *dev,const char *idstr, -void *opaque);typedef void QEMUResetHandler (void *opaque);
hw/ivshmem.c +14 -6
@@ -616,6 +616,18 @@ static void ivshmem_setup_msi(IVShmemState * s) { s->eventfd_table =qemu_mallocz (s->vectors *sizeof (EventfdEntry)); } +static int ivshmem_set_param (int blk_enable,int shared,void *opaque) +{ +IVShmemState *proxy = opaque; + +if (proxy->role_val ==IVSHMEM_PEER ) { +fprintf (stderr, +"ivshmem device in peer role, cannot be migrated or saved\n" ); +return -EINVAL ; + } +return 0 ; +} +static int ivshmem_save (QEMUFile * f,void *opaque) {IVShmemState *proxy = opaque;
@@ -683,8 +695,8 @@ static int pci_ivshmem_init(PCIDevice *dev) s->ivshmem_size =ivshmem_get_size (s); } -register_savevm (&s->dev.qdev,"ivshmem" ,0 ,0 , ivshmem_save, ivshmem_load, - dev); +register_savevm_live (&s->dev.qdev,"ivshmem" ,0 ,0 , ivshmem_set_param, +NULL , ivshmem_save, ivshmem_load, dev);/* IRQFD requires MSI */ if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) &&
@@ -707,10 +719,6 @@ static int pci_ivshmem_init(PCIDevice *dev) s->role_val =IVSHMEM_MASTER ;/* default */ } -if (s->role_val ==IVSHMEM_PEER ) { -register_device_unmigratable (&s->dev.qdev,"ivshmem" , s); - } - pci_conf = s->dev.config;pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_REDHAT_QUMRANET ); pci_conf[0x02 ] =0x10 ;
savevm.c +0 -31
@@ -1039,7 +1039,6 @@ typedef struct SaveStateEntry {const VMStateDescription *vmsd;void *opaque;CompatEntry *compat; -int no_migrate; } SaveStateEntry;
@@ -1103,7 +1102,6 @@ int register_savevm_live(DeviceState *dev, se->load_state = load_state; se->opaque = opaque; se->vmsd =NULL ; - se->no_migrate =0 ;if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) {char *id = dev->parent_bus->info->get_dev_path (dev);
@@ -1170,31 +1168,6 @@ void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) } } -/* mark a device as not to be migrated, that is the device should be -unplugged before migration */ -void register_device_unmigratable (DeviceState *dev,const char *idstr, -void *opaque) -{ -SaveStateEntry *se; -char id[256 ] ="" ; - -if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { -char *path = dev->parent_bus->info->get_dev_path (dev); -if (path) { -pstrcpy (id,sizeof (id), path); -pstrcat (id,sizeof (id),"/" ); -qemu_free (path); - } - } -pstrcat (id,sizeof (id), idstr); - - QTAILQ_FOREACH(se, &savevm_handlers, entry) { -if (strcmp (se->idstr, id) ==0 && se->opaque == opaque) { - se->no_migrate =1 ; - } - } -} - int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id,
@@ -1410,10 +1383,6 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id)static int vmstate_save (QEMUFile *f,SaveStateEntry *se) { -if (se->no_migrate) { -return -1 ; - } -if (!se->vmsd) {/* Old style */ return se->save_state (f, se->opaque); }