From 8221af076858e65c0a9ae1b4391abb5db9df378a Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 26 Apr 2017 20:08:51 +0200 Subject: [PATCH 05/11] block: code movement RH-Author: Jeffrey Cody Message-id: Patchwork-id: 74899 O-Subject: [RHEV-7.4 qemu-kvm-rhev 4/8] block: code movement Bugzilla: 1189998 RH-Acked-by: John Snow RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz Move bdrv_is_read_only() up with its friends. Reviewed-by: Stefan Hajnoczi Reviewed-by: John Snow Signed-off-by: Jeff Cody Message-id: 73b2399459760c32506f9407efb9dddb3a2789de.1491597120.git.jcody@redhat.com (cherry picked from commit 93ed524e3de732f70b3b042e3c56bc4ed719498d) Signed-off-by: Miroslav Rezanina --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index b74d445..bf09026 100644 --- a/block.c +++ b/block.c @@ -192,6 +192,11 @@ void path_combine(char *dest, int dest_size, } } +bool bdrv_is_read_only(BlockDriverState *bs) +{ + return bs->read_only; +} + int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp) { /* Do not set read_only if copy_on_read is enabled */ @@ -3375,11 +3380,6 @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr) *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors; } -bool bdrv_is_read_only(BlockDriverState *bs) -{ - return bs->read_only; -} - bool bdrv_is_sg(BlockDriverState *bs) { return bs->sg; -- 1.8.3.1