From nobody Tue Nov 26 08:43:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1708500552; cv=none; d=zohomail.com; s=zohoarc; b=lqm8rEEocT0rULmYg2uHmsmcsvlIxeaNHrEP9aYcmYO8FK8BJU+18b0NlSxqSMVdfioFd3ESy5+05YR4BF42TIZB/z4A7r1Z3d9NrC6/I5WkI3rHgrBWFXXOyNEMXYM6wUGviuz1xkhoZRrFUAlDcfTrDylrW/HBB2NjYg7Yh0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708500552; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o8fm2yRHF6DEME13NEBKgue9ogVA3uhrEbfuiTytNs0=; b=aydj3HFJQE6nztldxnC324jsLEJJyDBsHGiD254gJJP6CwW7zhPUzviHub/i/F+CuUT8Xegl7dvBa6Z2OaKLXQX41vtiaJBiRdTZcPmaLWUsXM2BHBtZSPYvuC9WBPtc4c3J6tsI5bRlTsUjbEB/AiGe3xx9yeJGEceQWVxRdLE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1708500552333599.0074513599077; Tue, 20 Feb 2024 23:29:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rch1T-0008OL-Ck; Wed, 21 Feb 2024 02:28:07 -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 1rch1N-0008NM-2g; Wed, 21 Feb 2024 02:28:01 -0500 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rch1F-0008UM-Do; Wed, 21 Feb 2024 02:27:55 -0500 Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:27:50 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa009.jf.intel.com with ESMTP; 20 Feb 2024 23:26:16 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500474; x=1740036474; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3JICSjf6M0kKgsolTp8ey2+2CcYHO111m7nPgLVo5Xw=; b=RUrAOgpPf496ZzQk5zzLEaaSclBY/Gf+ZBhIe9BHhp2vuQ/T3aelb+vj YmttMthRmK4AqGYj07zYxB6p8nnTphJssfM7qY26TrQFkG91Y4VmAMFfC 4McnsYoUAhQ4X+ngkSU8ViuhHCmo+8QK6Zbwoc4TXUyrJ91ftJ4nTM2ho HfqC+La3RaR8bS72I7FTfgxWR0IcH2OPfHuyWvwqFajcMp7orvH28xhd/ LOeXaMxia7cfbr7Lc3aA3lEPIGxwmD4Z4Q79j23GseF0r3OQOTYyG8mI1 KgZ2IWNu1AXvv5wwV4y9wTyi+lWsRekSL/WqRklk+lFI3yJErb/rryVg0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="13347368" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="13347368" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="4982749" From: Zhao Liu To: "Michael S . Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, Zhao Liu Subject: [PATCH v2] hw/intc: Handle the error of IOAPICCommonClass.realize() Date: Wed, 21 Feb 2024 15:39:48 +0800 Message-Id: <20240221073948.768828-1-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=192.198.163.9; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.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.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1708500553156100003 Content-Type: text/plain; charset="utf-8" From: Zhao Liu IOAPICCommonClass implements its own private realize(), and this private realize() allows error. Therefore, return directly if IOAPICCommonClass.realize() meets error. Signed-off-by: Zhao Liu --- v2: Add the missing ERRP_GUARD(). (Markus) --- hw/intc/ioapic_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index cb9bf6214608..efbe6958c8d7 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -152,6 +152,7 @@ static int ioapic_dispatch_post_load(void *opaque, int = version_id) =20 static void ioapic_common_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); IOAPICCommonState *s =3D IOAPIC_COMMON(dev); IOAPICCommonClass *info; =20 @@ -162,6 +163,9 @@ static void ioapic_common_realize(DeviceState *dev, Err= or **errp) =20 info =3D IOAPIC_COMMON_GET_CLASS(s); info->realize(dev, errp); + if (*errp) { + return; + } =20 sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->io_memory); ioapic_no++; --=20 2.34.1