From ef18859f76a1499b7d6ac1f3994dade1345088f2 Mon Sep 17 00:00:00 2001
Message-Id: <ef18859f76a1499b7d6ac1f3994dade1345088f2.1389014116.git.minovotn@redhat.com>
In-Reply-To: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
References: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 9 Dec 2013 14:08:54 +0100
Subject: [PATCH 06/50] block: make BdrvRequestFlags public
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
Message-id: <1386598178-11845-9-git-send-email-pbonzini@redhat.com>
Patchwork-id: 56045
O-Subject: [RHEL 7.0 qemu-kvm PATCH 08/52] block: make BdrvRequestFlags public
Bugzilla: 1007815
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
RH-Acked-by: Fam Zheng <famz@redhat.com>
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
From: Peter Lieven <pl@kamp.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 6faac15fa80c4c1f813d96afc13bceaa3bc5ffe7)
---
block.c | 5 -----
include/block/block.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
Signed-off-by: Michal Novotny <minovotn@redhat.com>
---
block.c | 5 -----
include/block/block.h | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 02994ec..b7ca799 100644
--- a/block.c
+++ b/block.c
@@ -51,11 +51,6 @@
#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
-typedef enum {
- BDRV_REQ_COPY_ON_READ = 0x1,
- BDRV_REQ_ZERO_WRITE = 0x2,
-} BdrvRequestFlags;
-
static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load);
static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
diff --git a/include/block/block.h b/include/block/block.h
index 15ffbd2..ce6e897 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -62,6 +62,11 @@ typedef struct BlockDevOps {
void (*resize_cb)(void *opaque);
} BlockDevOps;
+typedef enum {
+ BDRV_REQ_COPY_ON_READ = 0x1,
+ BDRV_REQ_ZERO_WRITE = 0x2,
+} BdrvRequestFlags;
+
#define BDRV_O_RDWR 0x0002
#define BDRV_O_SNAPSHOT 0x0008 /* open the file read only and save writes in a snapshot */
#define BDRV_O_NOCACHE 0x0020 /* do not use the host page cache */
--
1.7.11.7