From patchwork Wed Dec 20 17:14:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10126153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1EC9A6019C for ; Wed, 20 Dec 2017 17:49:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EF90289FD for ; Wed, 20 Dec 2017 17:49:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 024D728A84; Wed, 20 Dec 2017 17:49:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8546A289FD for ; Wed, 20 Dec 2017 17:49:58 +0000 (UTC) Received: from localhost ([::1]:60749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRiVB-00008v-NU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 Dec 2017 12:49:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhyW-0004oR-L5 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyV-0007KU-Rj for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:12 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyV-0007KB-Kk for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:11 -0500 Received: by mail-wm0-x241.google.com with SMTP id b76so11199761wmg.1 for ; Wed, 20 Dec 2017 09:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UCwSjQ9njJ0bp04+5jBz9InKa+wM5UY+BhrmOYTSnn0=; b=AN5xvPCvo9Aemr1ogbiVlultwo0rNbbtlBBTaWHbZ+KQuFghc6pkv1Pst9nlNt3WMH 4uN5I0FPZPsIddZiMbm3sYGOwCjnV6ANO+TU7FwVndh/Ir7oO72Af7iIS8ExslIB5eAD F2c/ZfYVPJbBLWnVP+eeg4AEW+YHUrkA0Gmv/bHYTKE64ACZvMwFzDPGJ3hN6Q8v6gA8 GSR90Nl0Zi7Tjf62yUVdP38eSoCQta/7wBEoHuFD0HSyYdw9jRBl2TPSidgc9DTBPjC2 c8G3HsWifjBbEy5l2gVLuChohsCQiwT6BRgyl8Vra2xsUB+3Mq/vloBwpf0X8zMakOs6 mreA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UCwSjQ9njJ0bp04+5jBz9InKa+wM5UY+BhrmOYTSnn0=; b=B9IJ0EtHDB2LbnEy/O5m03apydhVWz6Uzg3HrheIEyrx9q6rMG2GekMknKbIJMJ/Fp ZAwzKznppo9nRA2Ht4O578Z7mdqFk/OLeSfRtbk/8hvgd5cBRomhmivPGZHaBsQEN3sY BRYvaBagUlvt9lVspsZ0RmLrqUNLkdoWRnAd+06OIJVuv2RtfBhhpUziOrWVKX841PgJ CjoHMDiRAdv77fNTDqzOmt0AooyDrTlPVQXXtMg7p4JPqnI3kX8XtwlkBA73Jifs0gkl gu3lN2CjbdXs5pSryf5bZ+mU2FvGciIpvxtuxLJlw7QjEsf+YZrtUhtqzZNgPtflaQ1p OTiA== X-Gm-Message-State: AKGB3mL8bQrcDvoZWt+OAh9oSxVuC+t8bPPpzFcGbA/B896zCYmXCfB5 FtVFHO/Bta0o/lBRelbt0Kd7ZF3c X-Google-Smtp-Source: ACJfBouEJ3LX51QSPE5DPoBcpReE4oC0JUhWtEgp4Drk/Jv4j5QvAWxnzAjoKD5Pb4bItsI0iWGv6Q== X-Received: by 10.28.49.195 with SMTP id x186mr6808422wmx.116.1513790170360; Wed, 20 Dec 2017 09:16:10 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:45 +0100 Message-Id: <1513790098-9815-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 33/46] scsi: replace hex constants with #defines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Sense keys have nice #defines in scsi/constants.h, use them. Reported-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- scsi/utils.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scsi/utils.c b/scsi/utils.c index 61bc1a8..ddae650 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -339,16 +339,16 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, int scsi_sense_to_errno(int key, int asc, int ascq) { switch (key) { - case 0x00: /* NO SENSE */ - case 0x01: /* RECOVERED ERROR */ - case 0x06: /* UNIT ATTENTION */ + case NO_SENSE: + case RECOVERED_ERROR: + case UNIT_ATTENTION: /* These sense keys are not errors */ return 0; - case 0x0b: /* COMMAND ABORTED */ + case ABORTED_COMMAND: /* COMMAND ABORTED */ return ECANCELED; - case 0x02: /* NOT READY */ - case 0x05: /* ILLEGAL REQUEST */ - case 0x07: /* DATA PROTECTION */ + case NOT_READY: + case ILLEGAL_REQUEST: + case DATA_PROTECT: /* Parse ASCQ */ break; default: