From patchwork Sun Jun 24 04:06:06 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: 933845 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="JRroiVHf"; 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 41CzjS5Vt3z9s19 for ; Sun, 24 Jun 2018 14:24:44 +1000 (AEST) Received: from localhost ([::1]:40602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWwZu-0008OJ-EA for incoming@patchwork.ozlabs.org; Sun, 24 Jun 2018 00:24:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWwIo-0004Dl-TL for qemu-devel@nongnu.org; Sun, 24 Jun 2018 00:07:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWwIn-0004IS-73 for qemu-devel@nongnu.org; Sun, 24 Jun 2018 00:07:02 -0400 Received: from mail-qt0-x22e.google.com ([2607:f8b0:400d:c0d::22e]:38494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fWwIn-0004Hu-29; Sun, 24 Jun 2018 00:07:01 -0400 Received: by mail-qt0-x22e.google.com with SMTP id e11-v6so8765864qtp.5; Sat, 23 Jun 2018 21:07:01 -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=vxqTVJOLmR8PB0jtklnVhYLlbJq8FYLX5wti/CVLsYo=; b=JRroiVHf4/kdsIImQj1Kw5bQt49Uie0JFm0CHYJqPOkt8uij8yYppxr+UemIO/XR5t 0eLDenKJQoBesVUVYXr6DI55iTcnqYS4+/42A41kNc7/A9seCCeIFTo9LTso/eK3vxd5 RHJsOfEncFQNGx1onl4INdzPZzlrdO1Uj32H4Sz392uqmesjfQSTIyVLr3cQdGzs3o3H ef6eV31TI25RDHnqPxTQP6v3B8g/9Cb6iJ1R7I9Duj5nyd/t5kXjKMknLBjfHFkxp1MJ zsoJIfrrjGc3nqJx/D3Z8W0324FFth0rmHl4+hu2JXLx4RVDP8FCNX9oZQkkPmwIbsIQ Rxtg== 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=vxqTVJOLmR8PB0jtklnVhYLlbJq8FYLX5wti/CVLsYo=; b=juYK+6NihNk+xhFXeTppcVvgDQjoeMZUeecjVHBsdiU8OTqIB5vT8GBYWzIun7VDHI IEAJGHIFCI124DCqLWfv+HaNNT+WfmVjJu9obdnZrtX+eVIH4wTKa8OBMSwjtAP/O7mv fyqFlF9BrWAlvmCHILFTcfcZexQDxdt/ozg6qWYcydrph8iFg3ABwtYEyJbGz3+v/yAg oGujWyEcoVPYLXj1VJI69Pf1Zi+rvAT+BPLgFvZ6WvEY9lOOmgUn5H6ZiXMRvlMnnVuF 9TlUmfS1TB/UdDX2VL7WznzwTfH8G9FWHUeS9Yo0K42IqBMMJ0LkleVckuDTVMsvhNWt FR/A== X-Gm-Message-State: APt69E3k0+CFHOIxzDb82RN3t9L4+OSS4KizV8xkIQg4Hz5gVUICeqlt O6mLNlOurD9jpzLEX3gv2Kg= X-Google-Smtp-Source: AAOMgpcWxZgDytA+DWh2qhXvuY2vHhDF0NI3htFnQLiTnSYf5imqvZ+57vJ/cR0KkZITcTvNKIiBqg== X-Received: by 2002:ac8:1b9a:: with SMTP id z26-v6mr6607134qtj.344.1529813220581; Sat, 23 Jun 2018 21:07:00 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id d14-v6sm7145313qtn.90.2018.06.23.21.06.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Jun 2018 21:07:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth Date: Sun, 24 Jun 2018 01:06:06 -0300 Message-Id: <20180624040609.17572-14-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624040609.17572-1-f4bug@amsat.org> References: <20180624040609.17572-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::22e Subject: [Qemu-devel] [PATCH v3 13/16] 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é Reviewed-by: Thomas Huth --- 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..9094c0b47c 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) Illegal register" + " 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) Illegal register" + " 0x%" HWADDR_PRIx "\n", + s->bank, offset); return 0; }