From patchwork Fri Sep 20 15:08:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 276515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3ADDE2C00CF for ; Sat, 21 Sep 2013 01:12:15 +1000 (EST) Received: from localhost ([::1]:56378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2NQ-0001pY-HB for incoming@patchwork.ozlabs.org; Fri, 20 Sep 2013 11:12:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2KG-00061P-Ev for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:09:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VN2K4-0007tp-JR for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:08:56 -0400 Received: from mail-ee0-x230.google.com ([2a00:1450:4013:c00::230]:41609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2K4-0007tb-Cv for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:08:44 -0400 Received: by mail-ee0-f48.google.com with SMTP id l10so330498eei.21 for ; Fri, 20 Sep 2013 08:08:43 -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:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=nm/HVgQxC3RpYAHRXJRYuzWfppFqbm1/09J+enz6mU4=; b=M+NsHEKPnQX18j444Tjgy293hFdzOPyF7sKPB6ysZKMIrDjh8obJjzMVXV07duZ5OO tLe7Ai6WvQm+wrim90rIh+KqZvtICV3P98qLRXJXjMYY/cMb8U3ozZ0d3/Q24pX1hn1J rPM1I0rcwk3rNPVo6OPeu6dBkxQcVITCF3vlEu6ZcjCSFaxGnZQB6xs9wlROQupN5Zb7 bPamp15YyIWu5ao5LNy6n1Rbk8F6oz3W8/5EmlVOI09IdQXiYJ2GqFeM3yTHt472VTDO VOLGH6Al3UbYamQfvfd7AFBntzg7Y6YVHdFbIHXdIpvvX9PHlCRJh2Dy8NIhiiX6IhpT 0+Xg== X-Received: by 10.15.56.199 with SMTP id y47mr3686420eew.73.1379689723694; Fri, 20 Sep 2013 08:08:43 -0700 (PDT) Received: from playground.lan (net-2-39-10-130.cust.dsl.vodafone.it. [2.39.10.130]) by mx.google.com with ESMTPSA id h45sm11444441eeg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 20 Sep 2013 08:08:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 20 Sep 2013 17:08:31 +0200 Message-Id: <1379689715-628-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1379689715-628-1-git-send-email-pbonzini@redhat.com> References: <1379689715-628-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::230 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PULL 2/6] lsi: check ssid versus sdid only if ssid is valid 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 From: Hervé Poussineau This prevents some (invalid) error messages on console. Signed-off-by: Hervé Poussineau Signed-off-by: Paolo Bonzini --- hw/scsi/lsi53c895a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 4cc0c6a..4314efe 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1699,8 +1699,9 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) s->sxfer = val; break; case 0x06: /* SDID */ - if ((val & 0xf) != (s->ssid & 0xf)) + if ((s->ssid & 0x80) && (val & 0xf) != (s->ssid & 0xf)) { BADF("Destination ID does not match SSID\n"); + } s->sdid = val & 0xf; break; case 0x07: /* GPREG0 */