cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-remove-QED-.bdrv_make_empty-implementation.patch

0a122b
From ebb0a0980d8347add30842be49555e4f07a4a047 Mon Sep 17 00:00:00 2001
0a122b
From: Jeffrey Cody <jcody@redhat.com>
0a122b
Date: Tue, 11 Feb 2014 16:14:29 +0100
0a122b
Subject: [PATCH 23/28] block: remove QED .bdrv_make_empty implementation
0a122b
0a122b
RH-Author: Jeffrey Cody <jcody@redhat.com>
0a122b
Message-id: <2f8e3c76feeda371ed325fb08b26f3bf7e776db3.1392134912.git.jcody@redhat.com>
0a122b
Patchwork-id: 57219
0a122b
O-Subject: [RHEL7 qemu-kvm PATCH 5/6] block: remove QED .bdrv_make_empty implementation
0a122b
Bugzilla: 1047254
0a122b
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
0a122b
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
0a122b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
0a122b
The QED .bdrv_make_empty() implementation does nothing but return
0a122b
-ENOTSUP, which causes problems in bdrv_commit().  Since the function
0a122b
stub exists for QED, it is called, which then always returns an error.
0a122b
0a122b
The proper way to not support an optional driver function stub is to
0a122b
just not implement it, so let's remove the stub.
0a122b
0a122b
Signed-off-by: Jeff Cody <jcody@redhat.com>
0a122b
Reviewed-by: Benoit Canet <benoit@irqsave.net>
0a122b
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
(cherry picked from commit 55aff7f133b0eb20b2c8a2a3e1307240aab8044c)
0a122b
---
0a122b
 block/qed.c | 6 ------
0a122b
 1 file changed, 6 deletions(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 block/qed.c |    6 ------
0a122b
 1 files changed, 0 insertions(+), 6 deletions(-)
0a122b
0a122b
diff --git a/block/qed.c b/block/qed.c
0a122b
index da68152..be5945b 100644
0a122b
--- a/block/qed.c
0a122b
+++ b/block/qed.c
0a122b
@@ -731,11 +731,6 @@ static int64_t coroutine_fn bdrv_qed_co_get_block_status(BlockDriverState *bs,
0a122b
     return cb.status;
0a122b
 }
0a122b
 
0a122b
-static int bdrv_qed_make_empty(BlockDriverState *bs)
0a122b
-{
0a122b
-    return -ENOTSUP;
0a122b
-}
0a122b
-
0a122b
 static BDRVQEDState *acb_to_s(QEDAIOCB *acb)
0a122b
 {
0a122b
     return acb->common.bs->opaque;
0a122b
@@ -1617,7 +1612,6 @@ static BlockDriver bdrv_qed = {
0a122b
     .bdrv_create              = bdrv_qed_create,
0a122b
     .bdrv_has_zero_init       = bdrv_has_zero_init_1,
0a122b
     .bdrv_co_get_block_status = bdrv_qed_co_get_block_status,
0a122b
-    .bdrv_make_empty          = bdrv_qed_make_empty,
0a122b
     .bdrv_aio_readv           = bdrv_qed_aio_readv,
0a122b
     .bdrv_aio_writev          = bdrv_qed_aio_writev,
0a122b
     .bdrv_co_write_zeroes     = bdrv_qed_co_write_zeroes,
0a122b
-- 
0a122b
1.7.1
0a122b