[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker
From: |
KONRAD Frederic |
Subject: |
[Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution |
Date: |
Tue, 1 Aug 2017 10:10:48 +0200 |
This adds a migration blocker when mmio_execution has been used.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/ssi/xilinx_spips.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index e833028..d46491f 100644
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -31,6 +31,8 @@
#include "hw/ssi/ssi.h"
#include "qemu/bitops.h"
#include "hw/ssi/xilinx_spips.h"
+#include "qapi/error.h"
+#include "migration/blocker.h"
#ifndef XILINX_SPIPS_ERR_DEBUG
#define XILINX_SPIPS_ERR_DEBUG 0
@@ -139,6 +141,7 @@ typedef struct {
uint8_t lqspi_buf[LQSPI_CACHE_SIZE];
hwaddr lqspi_cached_addr;
+ Error *migration_blocker;
} XilinxQSPIPS;
typedef struct XilinxSPIPSClass {
@@ -603,6 +606,14 @@ static void *lqspi_request_mmio_ptr(void *opaque, hwaddr
addr, unsigned *size,
XilinxQSPIPS *q = opaque;
hwaddr offset_within_the_region = addr & ~(LQSPI_CACHE_SIZE - 1);
+ /* mmio_execution breaks migration better aborting than having strange
+ * bugs.
+ */
+ if (!q->migration_blocker) {
+ error_setg(&q->migration_blocker, "booting from SPI breaks migration");
+ migrate_add_blocker(q->migration_blocker, &error_fatal);
+ }
+
lqspi_load_cache(opaque, offset_within_the_region);
*size = LQSPI_CACHE_SIZE;
*offset = offset_within_the_region;
--
1.8.3.1
- [Qemu-devel] [PATCH for-2.10 0/2] mmio-execution and migration, KONRAD Frederic, 2017/08/01
- [Qemu-devel] [PATCH for-2.10 1/2] mmio-execution: warn the potential developer about migration, KONRAD Frederic, 2017/08/01
- [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution,
KONRAD Frederic <=
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, Peter Maydell, 2017/08/01
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, KONRAD Frederic, 2017/08/01
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, Edgar E. Iglesias, 2017/08/01
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, KONRAD Frederic, 2017/08/01
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, Peter Maydell, 2017/08/01
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, Peter Maydell, 2017/08/10
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, Edgar E. Iglesias, 2017/08/10
- Re: [Qemu-devel] [PATCH for-2.10 2/2] xilinx-spips: add a migration blocker when using mmio_execution, KONRAD Frederic, 2017/08/10