From patchwork Thu Jun 21 18:02:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 932873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lgOg8gnS"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41BVBB2G4nz9s47 for ; Fri, 22 Jun 2018 04:10:58 +1000 (AEST) Received: from localhost ([::1]:57054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fW42p-0006g9-Tl for incoming@patchwork.ozlabs.org; Thu, 21 Jun 2018 14:10:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fW3vJ-0000mJ-5t for qemu-devel@nongnu.org; Thu, 21 Jun 2018 14:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fW3vI-0006hF-7G for qemu-devel@nongnu.org; Thu, 21 Jun 2018 14:03:09 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:41907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fW3vI-0006h4-20; Thu, 21 Jun 2018 14:03:08 -0400 Received: by mail-qt0-x241.google.com with SMTP id y20-v6so3666003qto.8; Thu, 21 Jun 2018 11:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GnD9db+GG2BdlKeK0fJQYmrK38suHyZoUcP+/Y0sDZ0=; b=lgOg8gnSeZ58kQWTocLbhrlZf6Mk9YtYkagMD4wJBZyO3PbQFtnwPNeFdr/wkS7BqC bfeljfZOTbr6vXw+DGOyHsNInrQZob1FjsTgC1EGM1dvghyQc/8a+Ddmi1DENxLooHhB 813XN0/8hvDX4besFmwka+5eO7+SzzURyU9bfnv8GfbvX34o0BClU/60Kf+q9TENQa9/ 3GTjA3tNBZvtEV89Xlck83masjnGzZLl0wINXmfKm/839pwy059EMh0f7WXmAAhn6FQJ hgm8QUDNfqVrK8+6BTrw0zxqu+QPq6GHYsOpRqmQ4CTqu9PR7LtDHjPsrijrZiJnBE9G KOGg== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GnD9db+GG2BdlKeK0fJQYmrK38suHyZoUcP+/Y0sDZ0=; b=t28ZVZT7kjPfEPtigIRcm9puSWdSkuQQeyzQjrQsCrQheYteAUgsNKXSx1ZyZZrltC Q8rbFr9oqkBQLuHIAqzAEjQsvKXB+FeVRi+zs785tKlan8XIBBOxwbWcHMVZcyQ9FlhA xgQzBelc1UT2SzcpWI9sd/PIfwoQkFGEWRo+cmdvPOe6XsuHkp1NURSh72nBWkNofxsF P1XUADADNazBkAt+Dfm07FVu5fGLC1Bl1Au6yMETX+iPpT/ZFEdyuqRmuKECUbH7wIel BR6ftJtMmwnNSR/JiF2eL634F1OhvQQERKWjI3EbRVJ1HqY5RVdjw2sEaY7AcRFlUyCs LBPA== X-Gm-Message-State: APt69E3KrIBTdxlEUgFzrXqDkLHL81Vxe0BxZcuYuIJ+QbddIUjlrA/a 3aGAlW5F7q7btuCC54xrQIeFHStJ X-Google-Smtp-Source: ADUXVKJkXtywf52MIg6BFmI308L62tGk2lWqCREs9fJ5rGAZRCDgKeCYD/vF4CwlcllCvocsHt9P+A== X-Received: by 2002:a0c:9123:: with SMTP id q32-v6mr23501395qvq.136.1529604187450; Thu, 21 Jun 2018 11:03:07 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id w51-v6sm2469469qta.12.2018.06.21.11.03.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 11:03:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell Date: Thu, 21 Jun 2018 15:02:24 -0300 Message-Id: <20180621180224.8312-12-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0.rc2 In-Reply-To: <20180621180224.8312-1-f4bug@amsat.org> References: <20180621180224.8312-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 11/11] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error 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: , Cc: qemu-trivial@nongnu.org, Jason Wang , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw_error() finally calls abort(), but there is no need to abort here. Signed-off-by: Philippe Mathieu-Daudé --- hw/net/smc91c111.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index c8cc5379b7..705a034cb9 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -11,6 +11,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "hw/devices.h" +#include "qemu/log.h" /* For crc32 */ #include @@ -478,7 +479,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset, } break; } - hw_error("smc91c111_write: Bad reg %d:%x\n", s->bank, (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "smc91c111_write(bank:%d) 0x%" HWADDR_PRIx " = 0x%x\n", + s->bank, offset, value); } static uint32_t smc91c111_readb(void *opaque, hwaddr offset) @@ -621,7 +624,9 @@ static uint32_t smc91c111_readb(void *opaque, hwaddr offset) } break; } - hw_error("smc91c111_read: Bad reg %d:%x\n", s->bank, (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "smc91c111_read(bank:%d) 0x%" HWADDR_PRIx "\n", + s->bank, offset); return 0; }