From patchwork Wed Oct 5 07:17:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 117760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C50CB6F8B for ; Wed, 5 Oct 2011 19:06:58 +1100 (EST) Received: from localhost ([::1]:47568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLkW-0000t2-Hw for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2011 03:18:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjo-0007FH-UY for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:18:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBLjn-0006Fg-Ad for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:17:56 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:35870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjn-0006EY-4Y for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:17:55 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1507475wyh.4 for ; Wed, 05 Oct 2011 00:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=nSG9HOnGtO//I9zwT1ahcYeJcGrakmG1Ld9w0L7wiYs=; b=BNieiQ604HC91bbddDz+2NCyB112DMcdJz+IP82km4Hr+aaosOL9Uolz2sorl5BQyP KqrQcUdvVXT6KYOjjCeKpF5unWM4uN1hE5vvI66R7MCQI9p8tu3WIGu9hxHsY/ul0hpT cJWEy5bUoNtDh9iXWcOfK52govj9B7onnzH4g= Received: by 10.227.154.2 with SMTP id m2mr2501747wbw.39.1317799074742; Wed, 05 Oct 2011 00:17:54 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id p2sm1192306wbo.17.2011.10.05.00.17.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Oct 2011 00:17:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2011 09:17:36 +0200 Message-Id: <1317799065-29668-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> References: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH v3 06/15] block: group together the plugging of synchronous IO emulation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }