From patchwork Fri Jun 15 15:05:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 165197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 64677B7035 for ; Sat, 16 Jun 2012 02:26:56 +1000 (EST) Received: from localhost ([::1]:59200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfY7f-0004fF-GF for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2012 11:07:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfY6v-000388-In for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:06:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfY6t-0004oz-0i for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:06:53 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfY6s-0004gs-Lg for qemu-devel@nongnu.org; Fri, 15 Jun 2012 11:06:50 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so5648793pbb.4 for ; Fri, 15 Jun 2012 08:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=cIcO/9geYC2xECiBIPY1qtOXL93KrAKBNzkGH5tkU4U=; b=D1aNhb9XyfiSDy5D7CNGlbkUMb35GQJ4fXaWpceyqFIVafZIbKA9hycMwqZvmn54A9 pdDu5+ybqFONsU+k8VJqCpAUrD581E1xtMTggm3+VVWsXQuW34+vwzXit8GlIMpNR/Yj Jp/54/628//FBXbDFOCCpB9O+3LwIQvRmufrCOaAYbkY4+aXDiiUoBZVExySzBmlJozT x+s/WTP/0oWZUDA4uq758KnN3amf1cDDgF8H93yqScz4BZ1PXLsASSShsMy6RFzhHez6 GxPp5j75o5wU5v2dTJKKW9WcDC5fy+Y430GrCDFyViORVXTEDvpdekrnmTOQoj2dBqHk UaGg== Received: by 10.68.220.10 with SMTP id ps10mr9050295pbc.105.1339772809711; Fri, 15 Jun 2012 08:06:49 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-204-25.ip51.fastwebnet.it. [93.34.204.25]) by mx.google.com with ESMTPS id rs3sm13501390pbc.47.2012.06.15.08.06.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Jun 2012 08:06:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Jun 2012 17:05:35 +0200 Message-Id: <1339772759-31004-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <1339772759-31004-1-git-send-email-pbonzini@redhat.com> References: <1339772759-31004-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [RFC PATCH 12/36] block: sort BlockDeviceIoStatus errors by severity 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 Signed-off-by: Paolo Bonzini --- block.c | 11 ++++++++--- qapi-schema.json | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 4011ce4..2f6384a 100644 --- a/block.c +++ b/block.c @@ -4133,9 +4133,14 @@ void bdrv_iostatus_reset(BlockDriverState *bs) void bdrv_iostatus_set_err(BlockDriverState *bs, int error) { assert(bdrv_iostatus_is_enabled(bs)); - if (bs->iostatus == BLOCK_DEVICE_IO_STATUS_OK) { - bs->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE : - BLOCK_DEVICE_IO_STATUS_FAILED; + BlockDeviceIoStatus new_status = + (error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE : + BLOCK_DEVICE_IO_STATUS_FAILED); + + /* iostatus values are sorted from less severe to most severe + * (ok, nospace, failed). */ + if (bs->iostatus < new_status) { + bs->iostatus = new_status; } } diff --git a/qapi-schema.json b/qapi-schema.json index b760bc8..d09d267 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -429,7 +429,7 @@ # # Since: 1.0 ## -{ 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } +{ 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'nospace', 'failed' ] } ## # @BlockInfo: