From patchwork Thu Oct 19 21:17:47 2023 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: 735626 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1731716wro; Thu, 19 Oct 2023 14:25:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrY139MuH+mQUmszbUMJQa5UwexQUPb1MMh+uzaFlUe1TudKksL+EZgCo1XX3f93oEDUZh X-Received: by 2002:a05:620a:2546:b0:76c:ad46:2683 with SMTP id s6-20020a05620a254600b0076cad462683mr3366053qko.16.1697750719501; Thu, 19 Oct 2023 14:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697750719; cv=none; d=google.com; s=arc-20160816; b=NqUv7J+kF6MrAiqtfkU5wagRZA/StduEdPg00YZ3PXoL5cfTEURFKhM/NpH6snCl/H 1fEQ6mpLTafnhBzgoMFT1KZdTGr2XpbWMVUqgTJkb+RxML6X9YreccuTqvkmS4ZPY0le vI+m5AqMREB7j1j2wCRNCN4AxzfWoQghjxOV6d8ZT8l6LhrW6uw6hNjGaSzjAa5TWQBk EV1IzecPGtaO6WI0sP72yFDzkJ5+HLigrFG36QmkZ5S+jPhxRMBjqIgGihMRXRpHIUDU fjYDfbcIfPhL2MlsbornYu3alkKhwD3Ipggzz5x4vCOpi9VogCk3IvJfFnU3PJRTqVd+ rCfg== 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=+goD7LWLLFlekg91oCfVK0c1MbYgJUFGIQyLFSXN/qg=; fh=pVLM9laBtsWiOgnviUzK78NWnadIGpJJW4/pVzh5tWE=; b=ZlT3r/Vd9fjFK9tloJdU0T0keAygj88Y+p5jK4l/6BNFeSgXjsBHR+lIxu99mrCypJ ywaLmsDiwzjdI3IFHks+g4n8xqyoZ0Q0JOjm7a6ve36ZLDAJRZY2jB7aB4hvSOMtkdiS eUqLjJNM9F+PP43IWzHLvx7wuNEJH+HLrK/j1iJxwB8mgBhjKPOL/w3bZbepVeRWGswk 8XHBZLs1edltXWbACoysJttvcVwX9XQOVbxu+KLDnBpZcgouta2JCoqOcd72Lb61Dhp/ aThumcReZsT3Ohr9VYUKdTc1J35GSFtH2yZ1TxbluJdpNKAtg/guB/ukfh2QB7h2d6mo d9OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xqWe5ihy; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j13-20020a37c24d000000b0077262b2e26fsi256689qkm.68.2023.10.19.14.25.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 14:25:19 -0700 (PDT) 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=@linaro.org header.s=google header.b=xqWe5ihy; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtaRn-0000sQ-SJ; Thu, 19 Oct 2023 17:20:51 -0400 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 1qtaRm-0000mO-6p for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:20:50 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtaRk-0005c1-0I for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:20:49 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4084e49a5e5so991425e9.3 for ; Thu, 19 Oct 2023 14:20:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697750442; x=1698355242; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+goD7LWLLFlekg91oCfVK0c1MbYgJUFGIQyLFSXN/qg=; b=xqWe5ihyuk0+TNFL5KnXF2wwqxS3v0AJvdzp3rw95bQk3FssjmYF9m3nz6rAJBI6bv PnOa13ojUMHUtUMfOHm0Qhp6KbuhMPW+nAsl3E1vvEuThYa0ir2z4DpVOAm52W7M/VIm 5vre2mF1ReaTR4Ns9yZWcFNIuQilw48YdO2reuh3MhHFAK02TgCzxGQ439mdugqmSNlY anIspcu7Ra9HBES2fWlK+uaP+x+sF9fTtVs/kq3zRx6z9vQdodSQpJEvJFfbKuvBULO/ HYa/oIz2drtoHaXPYlsSETyaCS0vDx0dnnvCQFG5JJ0Vw5tulTEel/rSnETs+WcPwL5h Phyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697750442; x=1698355242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+goD7LWLLFlekg91oCfVK0c1MbYgJUFGIQyLFSXN/qg=; b=Ji8aAuX7i1U4c4X0hv2vxCYNg8PAUVerk9YDMhgBcc90iAxDbld7JwOmWIF/19P9hb 73iLPnN3wv4t1rX3ivBaProykm6icwUVXz7glFShP/KAQBPgPtoRAiH5hXc1JVrOn0OP 6hjpNZt4lg/+pHxvOgyevXRrm/z9MY7YvChfBEH3BqAGjYepIpdoi0/HYr6m63jaFEkv oqTExuDYbMA+XjHjRpQPYi6z3K3qlzWzt7fIzM2X/xisUX4JhmJek0dWsUrbb5qddSuw BtsLx2Vy3dxrZaaVF7F3AH/kZahGKgPNfrDtcmPMhvq3MAiTNDXpo9cGWtSQFiQo9uKQ 2Q0w== X-Gm-Message-State: AOJu0YwHnyylX7nS5y1AoSrLZfwnOpMmlSAi4aSYyZ0CKXbsK9yWwsrg 7lHQaJSTmwc4qs1xlx0SjPx7fGOis+/jB6UelKpaIQ== X-Received: by 2002:a05:600c:35ca:b0:405:3955:5872 with SMTP id r10-20020a05600c35ca00b0040539555872mr15966wmq.18.1697750442279; Thu, 19 Oct 2023 14:20:42 -0700 (PDT) Received: from m1x-phil.lan (176-131-216-177.abo.bbox.fr. [176.131.216.177]) by smtp.gmail.com with ESMTPSA id fm12-20020a05600c0c0c00b004030e8ff964sm5346723wmb.34.2023.10.19.14.20.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Oct 2023 14:20:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , "Michael S. Tsirkin" , Paolo Bonzini Subject: [PULL 22/46] hw/intc/apic: Use ERRP_GUARD() in apic_common_realize() Date: Thu, 19 Oct 2023 23:17:47 +0200 Message-ID: <20231019211814.30576-23-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019211814.30576-1-philmd@linaro.org> References: <20231019211814.30576-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 APICCommonClass::realize() is a DeviceRealize() handler which take an Error** parameter and can fail. Do not proceed further on failure. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Xu Message-Id: <20231003082728.83496-2-philmd@linaro.org> --- hw/intc/apic_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 68ad30e2f5..bccb4241c2 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -257,6 +257,7 @@ static const VMStateDescription vmstate_apic_common; static void apic_common_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); APICCommonState *s = APIC_COMMON(dev); APICCommonClass *info; static DeviceState *vapic; @@ -267,6 +268,9 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info = APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); + if (*errp) { + return; + } /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&