[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 32/36] m25p80: Add 'lock-mode' property
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v8 32/36] m25p80: Add 'lock-mode' property |
Date: |
Fri, 30 Sep 2016 20:10:02 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
hw/block/m25p80.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index d29ff4c..3c1765a 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -380,6 +380,7 @@ typedef struct Flash {
SSISlave parent_obj;
BlockBackend *blk;
+ ImageLockMode lock_mode;
uint8_t *storage;
uint32_t size;
@@ -1144,6 +1145,7 @@ static void m25p80_realize(SSISlave *ss, Error **errp)
{
Flash *s = M25P80(ss);
M25P80Class *mc = M25P80_GET_CLASS(s);
+ Error *local_err = NULL;
s->pi = mc->pi;
@@ -1151,6 +1153,11 @@ static void m25p80_realize(SSISlave *ss, Error **errp)
s->dirty_page = -1;
if (s->blk) {
+ blk_lock_image(s->blk, s->lock_mode, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
DB_PRINT_L(0, "Binding to IF_MTD drive\n");
s->storage = blk_blockalign(s->blk, s->size);
@@ -1185,6 +1192,7 @@ static Property m25p80_properties[] = {
DEFINE_PROP_UINT8("spansion-cr3nv", Flash, spansion_cr3nv, 0x2),
DEFINE_PROP_UINT8("spansion-cr4nv", Flash, spansion_cr4nv, 0x10),
DEFINE_PROP_DRIVE("drive", Flash, blk),
+ DEFINE_PROP_LOCK_MODE("lock-mode", Flash, lock_mode),
DEFINE_PROP_END_OF_LIST(),
};
--
2.7.4
- [Qemu-devel] [PATCH v8 22/36] qemu-iotests: 030: Disable image locking when checking test image, (continued)
- [Qemu-devel] [PATCH v8 22/36] qemu-iotests: 030: Disable image locking when checking test image, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 23/36] iotests: 087: Disable image locking in cases where file is shared, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 24/36] iotests: 087: Disable image locking in cases where file is shared, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 25/36] iotests: 130: Check image info locklessly, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 26/36] iotests: Disable image locking in 085, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 27/36] tests: Use null-co:// instead of /dev/null, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 28/36] qemu-iotests: Add test case 153 for image locking, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 29/36] ahci: Use shared lock for shared storage migration, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 30/36] tests/postcopy: Use shared lock for images, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 31/36] fdc: Add lock-mode qdev properties, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 32/36] m25p80: Add 'lock-mode' property,
Fam Zheng <=
- [Qemu-devel] [PATCH v8 33/36] nand: Add 'lock-mode' property, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 34/36] onenand: Add 'lock-mode' property, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 35/36] spapr_nvram: Add 'lock-mode' property, Fam Zheng, 2016/09/30
- [Qemu-devel] [PATCH v8 36/36] sd: Add 'lock-mode' property, Fam Zheng, 2016/09/30