[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RESEND 13/50] block: Add BlockBackendRootState
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH RESEND 13/50] block: Add BlockBackendRootState |
Date: |
Tue, 27 Jan 2015 14:45:46 -0500 |
This structure will store some of the state of the root BDS if the BDS
tree is removed, so that state can be restored once a new BDS tree is
inserted.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 26 ++++++++++++++++++++++++++
include/block/block_int.h | 9 +++++++++
include/qemu/typedefs.h | 1 +
include/sysemu/block-backend.h | 2 ++
4 files changed, 38 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index 2a48e82..7be03ee 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -37,6 +37,10 @@ struct BlockBackend {
/* the block size for which the guest device expects atomicity */
int guest_block_size;
+ /* If the BDS tree is removed, some of its options are stored here (which
+ * can be used to restore those options in the new BDS on insert) */
+ BlockBackendRootState root_state;
+
/* I/O stats (display with "info blockstats"). */
BlockAcctStats stats;
@@ -1014,3 +1018,25 @@ int blk_load_vmstate(BlockBackend *blk, uint8_t *buf,
int64_t pos, int size)
{
return bdrv_load_vmstate(blk->bs, buf, pos, size);
}
+
+/*
+ * Updates the BlockBackendRootState object with data from the currently
+ * attached BlockDriverState.
+ */
+void blk_update_root_state(BlockBackend *blk)
+{
+ assert(blk->bs);
+
+ blk->root_state.open_flags = blk->bs->open_flags;
+ blk->root_state.read_only = blk->bs->read_only;
+ blk->root_state.detect_zeroes = blk->bs->detect_zeroes;
+
+ blk->root_state.io_limits_enabled = blk->bs->io_limits_enabled;
+ throttle_get_config(&blk->bs->throttle_state,
+ &blk->root_state.throttle_config);
+}
+
+BlockBackendRootState *blk_get_root_state(BlockBackend *blk)
+{
+ return &blk->root_state;
+}
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 69668e4..91d21c5 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -406,6 +406,15 @@ struct BlockDriverState {
NotifierWithReturn write_threshold_notifier;
};
+struct BlockBackendRootState {
+ int open_flags;
+ bool read_only;
+ BlockdevDetectZeroesOptions detect_zeroes;
+
+ bool io_limits_enabled;
+ ThrottleConfig throttle_config;
+};
+
/* Essential block drivers which must always be statically linked into qemu,
and
* which therefore can be accessed without using bdrv_find_format() */
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index cde3314..39a95dd 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -11,6 +11,7 @@ typedef struct AddressSpace AddressSpace;
typedef struct AioContext AioContext;
typedef struct AudioState AudioState;
typedef struct BlockBackend BlockBackend;
+typedef struct BlockBackendRootState BlockBackendRootState;
typedef struct BlockDriverState BlockDriverState;
typedef struct BusClass BusClass;
typedef struct BusState BusState;
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index c4a61c0..afb62e1 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -158,6 +158,8 @@ void blk_add_close_notifier(BlockBackend *blk, Notifier
*notify);
void blk_io_plug(BlockBackend *blk);
void blk_io_unplug(BlockBackend *blk);
BlockAcctStats *blk_get_stats(BlockBackend *blk);
+BlockBackendRootState *blk_get_root_state(BlockBackend *blk);
+void blk_update_root_state(BlockBackend *blk);
void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockBackend *blk,
BlockCompletionFunc *cb, void *opaque);
--
2.1.0
- Re: [Qemu-devel] [PATCH RESEND 17/50] block: Respect empty BB in bdrv_lookup_bs(), (continued)
- [Qemu-devel] [PATCH RESEND 37/50] block: Add blk_remove_bs(), Max Reitz, 2015/01/27
- [Qemu-devel] [PATCH RESEND 20/50] blockdev: Check blk_is_available() in sn-del-int-sync, Max Reitz, 2015/01/27
- [Qemu-devel] [PATCH RESEND 14/50] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/01/27
- [Qemu-devel] [PATCH RESEND 01/50] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/01/27
- [Qemu-devel] [PATCH RESEND 22/50] blockdev: Check BB validity in drive-backup TA, Max Reitz, 2015/01/27
- [Qemu-devel] [PATCH RESEND 13/50] block: Add BlockBackendRootState,
Max Reitz <=
- [Qemu-devel] [PATCH RESEND 24/50] blockdev: Check BB validity in block-stream, Max Reitz, 2015/01/27