From patchwork Tue Mar 7 07:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 659732 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2246292wrb; Mon, 6 Mar 2023 23:16:24 -0800 (PST) X-Google-Smtp-Source: AK7set9Z7C4pc/vROfU+BBk8K8escyujlSeWg8jsTgCLfJTdf586BMVlQROPsTl1psWyo++Y6bMF X-Received: by 2002:a05:6214:1c4c:b0:56b:ec30:67eb with SMTP id if12-20020a0562141c4c00b0056bec3067ebmr24281189qvb.39.1678173384670; Mon, 06 Mar 2023 23:16:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678173384; cv=none; d=google.com; s=arc-20160816; b=s3KAUzMK0BlnJtl3/vzTVoSm1NxpGxG6KDBVnnQbn82HD7L7+bmXaq5grm8ABdpbnS MdTleIuOCHPiuNG/86vpjMITzkNIB5cCmk7lXD+jA0+u5y607ELFznAHJeYb3OAFC2Y+ 6Lb5sWVZ7gv3yqUIS+Dca5vp+l4VeXMq+SYyfkvtRRRrhV2zQJC88AcpgZJRy9KTQV+j QvPijFvG6m+b1gEOPKnisTPuNWICC06e/EHP/vftRAq0ASq/waQxgQf1QA/o6T+D6CUD aAj2WnA5usPNPkvFgthca2LDnjgg6O8SYN/23v87juJWGTMx2/cN//9NRIgwFcUzt8WH a+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2rR0pQE5H3PbTtM8rztov3wJmNgdX7ZC1gpqYUZ5/7A=; b=KDICXwXTqiz3SPsu9Xz62o1Cdl8/1Z4kfza7ThGWV5wZiYbErz3t1/rl5agEoYl19u cFoCKOnER61fjlQcy8yPUE/frknZz+ZaLAIXNBOz1VNVIgTCT33DzR7YFbpjHS5j9W4q KDMGWV3CVmv15xrr7GZDxHyrRKaOX7Ba0lVF8c8ha+ekwhpcyWRUxWsa2/F7urpCl9Ov rMAqyhfHqYJ/c3QY0Rfkc+0lXbbNalaxExobBykXVpZaTMQgJ+Gf+asmaxTCqZ7nqkRZ 4A1Ooa1y6/CXsKYQkEOw2Z+pBfAfK6sZbkqkNFP8XGce81yHFCjncoMUGnG57kmYy1Mf wt2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HMs/bBWr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m2-20020a05620a24c200b007429b95c2dfsi10159373qkn.477.2023.03.06.23.16.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 23:16:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HMs/bBWr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZRU5-0006K3-8c; Tue, 07 Mar 2023 02:11:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZRTm-0005mU-DJ for qemu-devel@nongnu.org; Tue, 07 Mar 2023 02:11:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZRTb-0005rt-2y for qemu-devel@nongnu.org; Tue, 07 Mar 2023 02:11:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678173070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2rR0pQE5H3PbTtM8rztov3wJmNgdX7ZC1gpqYUZ5/7A=; b=HMs/bBWrlXTlTkbGkw1xaHcx8FXNQ2JcOASi0CNgfbcc4CENexHagrngAAp2G8bfp8a0Go uHwEdk5V01JW9U467szqpwwUD70eH2RcvxKzecr0SA9P6uw61h+Ycu4tWiBYt6S3wdiLpk pVnBHURL8H2L5NMIO9Cb5lCwmjAPAq0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-20-ougGEE9bNF2vMAxEh0iVtw-1; Tue, 07 Mar 2023 02:11:07 -0500 X-MC-Unique: ougGEE9bNF2vMAxEh0iVtw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3E771C08967; Tue, 7 Mar 2023 07:11:06 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-78.pek2.redhat.com [10.72.12.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AA6E40C10FA; Tue, 7 Mar 2023 07:11:04 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jason Wang Subject: [PULL 45/51] hw/net/eepro100: Abort if pci_add_capability() ever fail Date: Tue, 7 Mar 2023 15:08:10 +0800 Message-Id: <20230307070816.34833-46-jasowang@redhat.com> In-Reply-To: <20230307070816.34833-1-jasowang@redhat.com> References: <20230307070816.34833-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé If pci_add_capability() ever fail, the EEPRO100 device is broken, which is a bug. No need to report that to the user, abort instead. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Jason Wang --- hw/net/eepro100.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dc07984..dce7503 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -549,13 +549,8 @@ static void e100_pci_reset(EEPRO100State *s, Error **errp) if (info->power_management) { /* Power Management Capabilities */ int cfg_offset = 0xdc; - int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM, - cfg_offset, PCI_PM_SIZEOF, - errp); - if (r < 0) { - return; - } - + pci_add_capability(&s->dev, PCI_CAP_ID_PM, cfg_offset, PCI_PM_SIZEOF, + &error_abort); pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21); #if 0 /* TODO: replace dummy code for power management emulation. */ /* TODO: Power Management Control / Status. */