From nobody Fri Apr 19 20:04:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1605073820; cv=none; d=zohomail.com; s=zohoarc; b=QQYZ2yjrMEN/DQRsm8SmYyr16GYmbmcKcXBScqfzkv3j987e/2nO+lhDhuro38pd/5B1OX+HltcewFQDDlvMq0Cr/HlYu8JnFYAmg/VjaY9KilSNafE7Rd8ij2jhKo5AtCILma7kq1hgGlvGWhcIBsw75rydQ7q7cK/m2wSiY0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605073820; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8HUl3sIsB7tj41whqo0AC809SMSfM+7DMkhJUHNhwxE=; b=C+ZIXtkuxPubqrVf4dpIBhm4MZx5tMqwNMy5t9r5I0Rbw4mZyVV7pWya9DqeNCwXIxQ3fkOkhHg9HJ40mVSBtpm9gr67ig7b3MpR7SqfVhNXxjvRBpVFixRvpRJSlZtzjYdtjIG/MT+Nypi7SM7KMIbBAzF6xVkMLI88tFBEz5A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1605073820193770.9579471719591; Tue, 10 Nov 2020 21:50:20 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.24235.51359 (Exim 4.92) (envelope-from ) id 1kcj10-0003Va-Np; Wed, 11 Nov 2020 05:49:54 +0000 Received: by outflank-mailman (output) from mailman id 24235.51359; Wed, 11 Nov 2020 05:49:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kcj10-0003VT-Kf; Wed, 11 Nov 2020 05:49:54 +0000 Received: by outflank-mailman (input) for mailman id 24235; Wed, 11 Nov 2020 05:49:54 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kcj0z-0003VO-U5 for xen-devel@lists.xenproject.org; Wed, 11 Nov 2020 05:49:54 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cdbb153a-9754-4576-bc1f-b1305e7789a5; Wed, 11 Nov 2020 05:49:49 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6101DAD66; Wed, 11 Nov 2020 05:49:48 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kcj0z-0003VO-U5 for xen-devel@lists.xenproject.org; Wed, 11 Nov 2020 05:49:54 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cdbb153a-9754-4576-bc1f-b1305e7789a5; Wed, 11 Nov 2020 05:49:49 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6101DAD66; Wed, 11 Nov 2020 05:49:48 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cdbb153a-9754-4576-bc1f-b1305e7789a5 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1605073788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8HUl3sIsB7tj41whqo0AC809SMSfM+7DMkhJUHNhwxE=; b=aqXSvtmZIjbQ8QC9UXLDMOAC6MUfCxxoSwXcCFQgbEfsuVyvFeiu4aQ9OGyg/i00pFO2OK QDSJJTnNAcFJvhDsPh79F6GQZi2UVvH/pOfnbMZWhHJusf6L8sbIYVHXkOi1jGSaOhQWf/ QBRAw2XNUV8nv1jxcXE6BniXb4t5A+g= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH] xen/events: fix build Date: Wed, 11 Nov 2020 06:49:46 +0100 Message-Id: <20201111054946.3229-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Commit 5f2df45ead7c1195 ("xen/evtchn: rework per event channel lock") introduced a build failure for NDEBUG builds. Fixes: 5f2df45ead7c1195 ("xen/evtchn: rework per event channel lock") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 2 ++ xen/include/xen/sched.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index eacd96b92f..da85d536f4 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -61,7 +61,9 @@ static inline void evtchn_write_lock(struct evtchn *evtch= n) { write_lock(&evtchn->lock); =20 +#ifndef NDEBUG evtchn->old_state =3D evtchn->state; +#endif } =20 static inline void evtchn_write_unlock(struct evtchn *evtchn) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 7251b3ae3e..95f96e7a33 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -114,9 +114,7 @@ struct evtchn u16 virq; /* state =3D=3D ECS_VIRQ */ } u; u8 priority; -#ifndef NDEBUG u8 old_state; /* State when taking lock in write mode. */ -#endif u8 last_priority; u16 last_vcpu_id; #ifdef CONFIG_XSM --=20 2.26.2