From nobody Mon Feb 9 23:39:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629736931; cv=none; d=zohomail.com; s=zohoarc; b=ScAlb3F43KIX6xzz+kT7x4/oHhT4nIYkMRwLC3u1maXt8FZM6kX19WGMX0gBKXLx+2kyIUK5cMLUtT0aCJTCI84iyD5oVJLfgL6W8BFvricZ6W6nhJP+Wi92cava4JGPsmGgjNjzCPoU9CT/xFtTdyKVfA/k5qpWNtnwlT6xMWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629736931; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=OI0Wnegl08yE3mVvg9v+HREqmtz8aH+HipGhZs8+M71J4kwJ8C0KVC9goMrL1HSnfhY9w6N/ICb8NDmYqzJtMIREscVS8n05x3aOFhrMxpTNQvgWdur9z9h1h9kyKh/0a8CqFN+X2HN689gzpBf3WxP7Aj71UMGDlUUE5G1gB1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629736931590339.7295381521433; Mon, 23 Aug 2021 09:42:11 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-0oJxmqUgMDi4blJ_ihupgQ-1; Mon, 23 Aug 2021 12:42:09 -0400 Received: by mail-wm1-f72.google.com with SMTP id f19-20020a1c1f13000000b002e6bd83c344so190292wmf.3 for ; Mon, 23 Aug 2021 09:42:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id p9sm10502547wmq.40.2021.08.23.09.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 09:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629736930; 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=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=ZUWIeaTtn8ApgMFoddsw0I5m1AE9gP1Kr4sJZzebkOc96wwexZs3HA59MPrjm1OINnC7Vj ZlhHDFCxVpDraZyWyB/uOd5IoHWJCruKiSVyXQRNi2K+ufLcn/OrADiR7P5cIooPGeAdPG nNEYbX0lCtdAgGBtqPVQ5YWrvfZUt8U= X-MC-Unique: 0oJxmqUgMDi4blJ_ihupgQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ahhZw7UhNiaeiQddaQJNPmtavRWVitOR1ZCYyKxXHQ=; b=bY/0gFWeNwbgDhoWFZsLptUDjbsxqOBOFl989SqbNqAUnxpEXe1l7qsEisUpQki1BR aEuYeF+nyJ1I2pOWm8oD5ZTYXyHAf7QvtSZcy/PVVZFhN714VeCWvYGcddtyub8uDZi5 1HY1uVjxa0jp4RfaCnrFhyDTYMH8mBBXPai+h+J8ZYJ0MawwDoXlo2bcCqNVn437Xku/ 2I3gVgFNAfq3QWfTajLrVIiP58K3rXK5a9XYzTPxQ64YQPxzUo9AdAbjRgHLn0GkYV6D q0U7qLLHS8+5VffnQ00xCi51lmJtS3nXOT3plErT4rfyl1vqjrHQYko6RRi/bPZpaz5E Y8kQ== X-Gm-Message-State: AOAM5332Az54bG8gtPrdQrG8WdXh6Nt5Em8mck1LWB178mXF+4jxcaMf iEOvDvWrDFf0a6b8/jEbKhYkdAPzmInJcPFKdBu4n4n4kpLjJLZI4sNHM5+LdicodfHwJ9DW9dz 62POGfTUqfyha1Q== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr1825613wme.34.1629736928308; Mon, 23 Aug 2021 09:42:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5RC9IdJb8SJs6rfbcQqD7kcDryEb9HPPXiTquTariJ+esiuJJexDY4DS5jsKdOf/nbNpmuQ== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr1825597wme.34.1629736928186; Mon, 23 Aug 2021 09:42:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , David Hildenbrand , "Edgar E . Iglesias" , Peter Maydell , Stefan Hajnoczi , Jason Wang , qemu-arm@nongnu.org, Qiuhao Li , Peter Xu , Li Qiang , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 2/5] hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR Date: Mon, 23 Aug 2021 18:41:54 +0200 Message-Id: <20210823164157.751807-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823164157.751807-1-philmd@redhat.com> References: <20210823164157.751807-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629736933321100001 We are going to introduce more MemTxResult bits, so it is safer to check for !MEMTX_OK rather than MEMTX_ERROR. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Reviewed-by: Peter Maydell Reviewed-by: Peter Xu --- hw/intc/arm_gicv3_dist.c | 4 ++-- hw/intc/arm_gicv3_redist.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/intc/arm_gicv3_dist.c b/hw/intc/arm_gicv3_dist.c index b65f56f9035..e62a9cdfa8d 100644 --- a/hw/intc/arm_gicv3_dist.c +++ b/hw/intc/arm_gicv3_dist.c @@ -819,7 +819,7 @@ MemTxResult gicv3_dist_read(void *opaque, hwaddr offset= , uint64_t *data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest read at offset " TARGET_FMT_plx "size %u\n", __func__, offset, size); @@ -861,7 +861,7 @@ MemTxResult gicv3_dist_write(void *opaque, hwaddr offse= t, uint64_t data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest write at offset " TARGET_FMT_plx "size %u\n", __func__, offset, size); diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 53da703ed84..547281a8961 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -450,7 +450,7 @@ MemTxResult gicv3_redist_read(void *opaque, hwaddr offs= et, uint64_t *data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest read at offset " TARGET_FMT_plx " size %u\n", __func__, offset, size); @@ -507,7 +507,7 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr off= set, uint64_t data, break; } =20 - if (r =3D=3D MEMTX_ERROR) { + if (r !=3D MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid guest write at offset " TARGET_FMT_plx " size %u\n", __func__, offset, size); --=20 2.31.1