From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZN2-0003Ol-KO for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ZMw-00050o-39 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:24 -0400 Received: from mail-wy0-f175.google.com ([74.125.82.175]:40566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZMv-0004y7-V6 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:26:18 -0400 Received: by mail-wy0-f175.google.com with SMTP id 5so2976511wyh.34 for ; Fri, 16 Sep 2011 07:26:17 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 16 Sep 2011 16:25:43 +0200 Message-Id: <1316183152-5481-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1316183152-5481-1-git-send-email-pbonzini@redhat.com> References: <1316183152-5481-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 06/15] block: group together the plugging of synchronous IO emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is duplicated twice for read/write operations. Unify it, and move it close to the code that adds bdrv_flush. Signed-off-by: Paolo Bonzini --- block.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index ce35dce..394ecaf 100644 --- a/block.c +++ b/block.c @@ -189,26 +189,26 @@ void bdrv_register(BlockDriver *bdrv) /* Emulate AIO by coroutines, and sync by AIO */ bdrv->bdrv_aio_readv = bdrv_co_aio_readv_em; bdrv->bdrv_aio_writev = bdrv_co_aio_writev_em; - bdrv->bdrv_read = bdrv_read_em; - bdrv->bdrv_write = bdrv_write_em; } else { bdrv->bdrv_co_readv = bdrv_co_readv_em; bdrv->bdrv_co_writev = bdrv_co_writev_em; - if (!bdrv->bdrv_aio_readv) { /* add AIO emulation layer */ bdrv->bdrv_aio_readv = bdrv_aio_readv_em; bdrv->bdrv_aio_writev = bdrv_aio_writev_em; - } else if (!bdrv->bdrv_read) { - /* add synchronous IO emulation layer */ - bdrv->bdrv_read = bdrv_read_em; - bdrv->bdrv_write = bdrv_write_em; } } if (!bdrv->bdrv_aio_flush) { bdrv->bdrv_aio_flush = bdrv_aio_flush_em; - } else if (!bdrv->bdrv_flush) { + } + + /* add synchronous IO emulation layer */ + if (!bdrv->bdrv_read) { + bdrv->bdrv_read = bdrv_read_em; + bdrv->bdrv_write = bdrv_write_em; + } + if (!bdrv->bdrv_flush) { bdrv->bdrv_flush = bdrv_flush_em; } -- 1.7.6