[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 4/5] block: Move two block permission constants to th
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 4/5] block: Move two block permission constants to the relevant enum |
Date: |
Tue, 3 Jul 2018 16:59:14 +0200 |
From: Ari Sundholm <address@hidden>
This allows using the two constants outside of block.c, which will
happen in a subsequent patch.
Signed-off-by: Ari Sundholm <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/block.h | 7 +++++++
block.c | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/block/block.h b/include/block/block.h
index e5c7759a0c..bc76b1e59f 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -225,6 +225,13 @@ enum {
BLK_PERM_GRAPH_MOD = 0x10,
BLK_PERM_ALL = 0x1f,
+
+ DEFAULT_PERM_PASSTHROUGH = BLK_PERM_CONSISTENT_READ
+ | BLK_PERM_WRITE
+ | BLK_PERM_WRITE_UNCHANGED
+ | BLK_PERM_RESIZE,
+
+ DEFAULT_PERM_UNCHANGED = BLK_PERM_ALL & ~DEFAULT_PERM_PASSTHROUGH,
};
char *bdrv_perm_names(uint64_t perm);
diff --git a/block.c b/block.c
index 70a46fdd84..961ec97d26 100644
--- a/block.c
+++ b/block.c
@@ -1948,12 +1948,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm,
uint64_t shared,
return 0;
}
-#define DEFAULT_PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \
- | BLK_PERM_WRITE \
- | BLK_PERM_WRITE_UNCHANGED \
- | BLK_PERM_RESIZE)
-#define DEFAULT_PERM_UNCHANGED (BLK_PERM_ALL & ~DEFAULT_PERM_PASSTHROUGH)
-
void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c,
const BdrvChildRole *role,
BlockReopenQueue *reopen_queue,
--
2.13.6
- [Qemu-block] [PULL 0/5] Block layer patches, Kevin Wolf, 2018/07/03
- [Qemu-block] [PULL 1/5] qemu-img: allow compressed not-in-order writes, Kevin Wolf, 2018/07/03
- [Qemu-block] [PULL 4/5] block: Move two block permission constants to the relevant enum,
Kevin Wolf <=
- [Qemu-block] [PULL 3/5] qcow2: add compress threads, Kevin Wolf, 2018/07/03
- [Qemu-block] [PULL 5/5] block: Add blklogwrites, Kevin Wolf, 2018/07/03
- [Qemu-block] [PULL 2/5] qcow2: refactor data compression, Kevin Wolf, 2018/07/03
- Re: [Qemu-block] [PULL 0/5] Block layer patches, Peter Maydell, 2018/07/04