From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618764666; cv=none; d=zohomail.com; s=zohoarc; b=FIf3yW6UECM9HksKs3rNUdT7Loo2Th23qTEYy0DWPSzM6pkxIqNl95FEhUCY2pm7K2hFzRzUojSPcFYcciRAx6W5QHwIDGjoSLXPRYYeW1hkR10vLARfxJLwwy/22iiB+imEhGQsjWQPwwoiLQPVgOYHW8sNsW0R3ubGZ58HB/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618764666; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=qbo6eivOCaZBpkoFmmWLC7qMT2W86qCttoyj3YX6ZWc=; b=A+fYxN2Hx4N37PzPtR172RXwXOIJuDH7CygbtjX4NG5YlukCtu5g0lQAVul2SdCJlIOXrtu3Q5JCNi7eCTS1XiZDGSmfvTVsuc1j54Pt/HvqafdUEOoDsmnPgZO+9aYoX6LFpQlJsJK092cVZzeK26Wj4pazayhqT7MC5JWSdTs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1618764666264661.0291007108676; Sun, 18 Apr 2021 09:51:06 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id f195-20020a1c1fcc0000b029012eb88126d7so6816368wmf.3 for ; Sun, 18 Apr 2021 09:51:05 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id y125sm3598621wmy.34.2021.04.18.09.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 09:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qbo6eivOCaZBpkoFmmWLC7qMT2W86qCttoyj3YX6ZWc=; b=UkeIBWbSzl63CaNWGObT51yrq9c1SDqC5PnMaUHpSibk7NEDArNgviJjfkRZP+NGTd Ay/EDyDBTcImGi1W+IJqpqyAFHnT0nK8LJjZoq4UIQuf3in834HzCMBdnbpY2GVp5IZT ICgHICW49xzw9tVLa+JYxzAuoxKIvKsFbsGr+JV3zV8WiD9zPQ7tAexQ9rl7pJ4trDga Gs6Ogm7iVU+pJDdpZ8wUtIBC8voiQEQUir0oqJsbvnGXolkFvlLVXxCvefAJjgmZml8B 4V/g45ACtiDhXAdDsmchhTh+5WGoZXSPqlD8g4lWd2RjsL5+ljrQ+lACYTaw264o0Uay BeIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=qbo6eivOCaZBpkoFmmWLC7qMT2W86qCttoyj3YX6ZWc=; b=IJFjKeo9eudt74xcpKZYe9ymfSvu44nHB9AV2Lhc0L9KeGFG4kmLXzpYlYVgkQ9THe cGEQdbD4xkQ4L/JjrY6lQHI7HeGVHZm4NdVjqv2ymlabAfQQg/T5CKXysJQiX4y2DEsD T0W2+VGaEN+z7/i/8x7zn5ibu8DRXEP8YLlU0ZbWJ2p8casoEakNsMT5o4XcLQ/8p5q8 s3Xh7LAB2TP8XIA4gmsVrXgeN5X9LRrh9HYdF/w/n7qpXt6yxgwJgzSZluYUq9pghSzR b1vz557dc7Xw44vM3VUcTQCqi4i2krh3oBqsCMgCrG19tax7rVybbJTB2r0aG8ulJohV RLsQ== X-Gm-Message-State: AOAM533wocYqv5pnY/0mqTBC0/SgaDDpsZIYYwgDVU9KASC90TDLdozW 7h2BB0bd8b18C8lbCBgpjcr9VGwI+JsVjQ== X-Google-Smtp-Source: ABdhPJybhGhCwBFUpBvDgXv4awd2oQLR1L4KsDRNfT99mSnIMoDsnPrhbu+L0S8q5TIbPUCyTiZ6ig== X-Received: by 2002:a1c:7f4a:: with SMTP id a71mr17740127wmd.1.1618764664584; Sun, 18 Apr 2021 09:51:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Richard Henderson , Claudio Fontana Subject: [PATCH v2] hw/mips/jazz: Remove confusing ifdef'ry Date: Sun, 18 Apr 2021 18:51:02 +0200 Message-Id: <20210418165102.1139848-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The jazz machine is not used under user emulation and does not support KVM. Simplify the ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Claudio Fontana Message-Id: <20210226132723.3969650-3-f4bug@amsat.org> --- v2: Rebased. Based-on: <20210418163134.1133100-1-f4bug@amsat.org> --- hw/mips/jazz.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 1a0888a0fd5..29d32ef516f 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -120,7 +120,6 @@ static const MemoryRegionOps dma_dummy_ops =3D { #define MAGNUM_BIOS_SIZE = \ (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_M= AX) =20 -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static void (*real_do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, @@ -142,7 +141,6 @@ static void mips_jazz_do_transaction_failed(CPUState *c= s, hwaddr physaddr, (*real_do_transaction_failed)(cs, physaddr, addr, size, access_type, mmu_idx, attrs, response, retaddr); } -#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) @@ -211,10 +209,8 @@ static void mips_jazz_init(MachineState *machine, * memory region that catches all memory accesses, as we do on Malta. */ cc =3D CPU_GET_CLASS(cpu); -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) real_do_transaction_failed =3D cc->tcg_ops->do_transaction_failed; cc->tcg_ops->do_transaction_failed =3D mips_jazz_do_transaction_failed; -#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 /* allocate RAM */ memory_region_add_subregion(address_space, 0, machine->ram); --=20 2.26.3