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