From nobody Wed Nov 19 03:02:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1614346052; cv=none; d=zohomail.com; s=zohoarc; b=BoZmYsIdll02VkuRSWEG/Ovn07ZVD9dpTIYJ3s+Sa+ADkjzeZiGK1+a0qgV8GGjO6hifrPVXh9LO95SX4LkRZ3GiVO4shC9r0e4RAaYr/PdpsYXHJLONo50nwAV7GSrOa8EgmWwnz4ixUPnXzbtn6o/c/byeNyNkwq6dmWkQAEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614346052; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JWgGy7fjXHRska01RAxi8f5jwvzVQO+35Bzk4lClyhI=; b=ivl3Cvce8ewHPwew1BtOlwjUsftHCZFjn0GCj4QmM0a1XQ0I0PfmbhhYgIoqiT/fWNYyshQvELOQmAfMNmyTPT9/aLzyop69papvlffRaVuI74CPHJWtO1c0EypuilcUwtbeS8iSNQmO16giPWivvSu009JlyrTXt0qYY00zPJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1614346052887459.61553077994563; Fri, 26 Feb 2021 05:27:32 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id e10so8349324wro.12 for ; Fri, 26 Feb 2021 05:27:32 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id f7sm13086841wre.78.2021.02.26.05.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 05:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JWgGy7fjXHRska01RAxi8f5jwvzVQO+35Bzk4lClyhI=; b=BFYakLPfP8bYHYnSz0erQd9XvQpO8Lr35tVsvFzx/YwKD0oHUcTwUh7Sur72UZSC3y l/1AmmksttburX2ZfCDmZJqiqxaNQUJSWP22baxDhYEdCA+TG2ZqjvhjRxM3PoSFDnSb WDr1+gxshOydXPAy7bYQlRxTJ/uMkiKXGlu3CTb0TL2c/uUvqJRWzf2gBPqQjv6qZS6A jpTSjQhYuEaF2hJZUvUQU3PPbbnt8C3SMaCnMgTzxbwZF03p0plL4zffcoEaRWbgFxfF 9e8JxFe5YnGkbpGoQcsieKz+rzd6rJRBliMegeeZOyQKy/Fi+AwkRS+WSZhBZBBIEA+w euYw== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=JWgGy7fjXHRska01RAxi8f5jwvzVQO+35Bzk4lClyhI=; b=VL9CIwyaouhQBT4IxvANo70iplMhsJDMpkCwnBWzySAC2GYztO04IXw04YApD+42QJ /9pdrjAIxB2BLPjr9js2nCDMnkzTEL2bEug/R+eB7lIWuCWQ5rS/bESq3GdYiz7WhcuS lMb3EM6+7CKAgVBOzDShBcRkHoIFxImH1oZx91Km2arzGeTc/dh1oh+dioRNI6D8MAZQ CdGVbjqOWnivJ/8PeawYfptrw+f0uM+ZBOzDIkNSqqDtQBH9wanEpMa4QWCkvUvZ7n4K 5Tsukc7dHca2CHo+9Apd23UN4z3rblRQTsNQqZNCyEQ5n2PLvmuSovG0WTPo6TrfGJPZ I2gA== X-Gm-Message-State: AOAM531GWv9SCAtUGmXt5EhLyRaA1+Yh4JQ1TwXK419kLQxhe3Q1sN5y NmR36mfQnxuUAeLX/2pl14P9tciUov8= X-Google-Smtp-Source: ABdhPJzgGE4SjcJpwZn9nMKk9g3CRsk5SYEw9p1mk8n2U3fIy35dDpG34+zXzLyPhviMFpXpdzZNkw== X-Received: by 2002:adf:a4d1:: with SMTP id h17mr3246775wrb.57.1614346050965; Fri, 26 Feb 2021 05:27:30 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Claudio Fontana , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 1/2] hw/mips/meson: Restrict emulated machines to TCG accelerator Date: Fri, 26 Feb 2021 14:27:22 +0100 Message-Id: <20210226132723.3969650-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210226132723.3969650-1-f4bug@amsat.org> References: <20210226132723.3969650-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Ideally this should solved by Kconfig "depends on TCG", but we are not there yet: https://www.mail-archive.com/qemu-devel@nongnu.org/msg777710.html https://www.mail-archive.com/qemu-devel@nongnu.org/msg777632.html As a kludge, use meson to only include emulated machines when TCG accelerator is selected. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana --- hw/mips/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 1195716dc73..d172eee6e7d 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,12 +1,15 @@ mips_ss =3D ss.source_set() mips_ss.add(files('bootloader.c', 'mips_int.c')) mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c')) -mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c',= 'loongson3_virt.c')) -mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c= ')) -mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) -mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) =20 +if 'CONFIG_TCG' in config_all +mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) +mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) +mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) +mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) +endif + hw_arch +=3D {'mips': mips_ss} --=20 2.26.2 From nobody Wed Nov 19 03:02:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614346057; cv=none; d=zohomail.com; s=zohoarc; b=DGpu47AbXZcdk6MHzPAh25AkEwfw8x4FEaE2WEfZ48MbLA4DzH2e0oJUL+Tat2Q52FGNWxPkW1OvgaWTvwduc9qK7YTGlYBqa9v6sBl4QDtKEYk0X1LL7CFtuq0xD8r0FzuYsMt0Lf4FrfZAgcYglNJLYwYtmhqAK4sHxpWxG4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614346057; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2gsJbpv42AOeUT/UNWYygQZCoVIRU495UbUCd6k+cHQ=; b=UqCj2fXUy4K5g2eQbLd+BF+OLz/uvk4tf7UxF9+ilRKRjE92YDdyS35z8GwzWaKd6+SaupHOpS5trwgo0KzpwBBwAi49OCd2hiE3JVe/6xKY0VsQM64LQI6kzlYb5R8ju75UJ5xEdZOmVeKTNy8fMyZ4MG4OLT9tCall5kC+b9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1614346057599777.1518319810104; Fri, 26 Feb 2021 05:27:37 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id k66so7809276wmf.1 for ; Fri, 26 Feb 2021 05:27:37 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q24sm11292063wmq.24.2021.02.26.05.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 05:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2gsJbpv42AOeUT/UNWYygQZCoVIRU495UbUCd6k+cHQ=; b=fvfLrsoVMRAMU58KR3idQk1b3ge8+ujusZ2EWBChjWU7xFi0mi7G2jWHRaEz+mQ5iU IEdUGtRIaZkWMxn3b0twWN3jLK4WssbPnkPRpJcRlrQ1Dgi6sE8mk3d0rLJk0sP8aIew gl7tFV2EvcsYulNYoS/I47Zj1RdBsoStVSN1Ty52aGAMhu1ATw9GZITHgDKh8aAn0Eb1 /mxz6uPFBS5Ayf+SHdIQ3OIBnHem+IigBe0JG2S68+djNRPrCEAKO4oKeaDQaDw9fu/p UVN4Xvn9OcbZuPy4Qpu4AJn94VCReP6g9vQBkXwntVv+0GY9a8KpEfPem0N4I0LAFFvi qEcw== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=2gsJbpv42AOeUT/UNWYygQZCoVIRU495UbUCd6k+cHQ=; b=PDgzbH1KugRZwNxGDt0R1ANo1GC//4mmUjaz7SxYSEWDysgf+mjp3rY1tF8BJF+cc0 F9V2MhqJp+2AqpG5qF2MO+QL9QjKPtOiL41NP19bGps5tA+ep+V2nZEoKEKi8oFD73el +ZHJaWjDYnUuU5Q2nJR83wEwEeb7ymDfRm8CdwER1Se8ab2ghRXkzXl6u6bh2+NqsREX +bljvXull7aNcaDuAij3PHhbM6XYY+ar+zVGw/b0MSPkYYj8S6lW6UnUvoRAhzCuVdol t3i/To5xAUVzKjV/RPYobKNNPdCkMwAchMjy5vhg51GhvZAD9eJIFQlt3Gi3GmOvxGja YOMA== X-Gm-Message-State: AOAM5327RSIxGsSja3RFlL2de6cCRJn88R4V6wHk7rDcFr5Op2soqeCs WgsTDk1kD+ShUxpjapO4P9eRqksVy2c= X-Google-Smtp-Source: ABdhPJzCoJFwKU+broPBDV+da3ZWpYLJzHCMcZxnsZXA1QMVBj8Xg6STu7iOJ7lilmivaggNoCwCbQ== X-Received: by 2002:a1c:c244:: with SMTP id s65mr2924446wmf.96.1614346055827; Fri, 26 Feb 2021 05:27:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Claudio Fontana , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 2/2] hw/mips/jazz: Remove confusing ifdef'ry Date: Fri, 26 Feb 2021 14:27:23 +0100 Message-Id: <20210226132723.3969650-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210226132723.3969650-1-f4bug@amsat.org> References: <20210226132723.3969650-1-f4bug@amsat.org> 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: Claudio Fontana Reviewed-by: Richard Henderson --- hw/mips/jazz.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 83c80860626..cd24e8778b1 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.2