From patchwork Tue Mar 5 22:09:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13583053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1821C54798 for ; Tue, 5 Mar 2024 22:10:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhcyx-0007AV-J4; Tue, 05 Mar 2024 17:09:55 -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 1rhcyw-00079r-7K for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:09:54 -0500 Received: from mail-ua1-x935.google.com ([2607:f8b0:4864:20::935]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhcyu-0000jj-Nw for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:09:53 -0500 Received: by mail-ua1-x935.google.com with SMTP id a1e0cc1a2514c-7d698a8d93cso3517681241.3 for ; Tue, 05 Mar 2024 14:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709676591; x=1710281391; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; b=GVQuvzjOg8/ZZhxnyS+eSqCQLBjKDeNAEKTlSNniVeU0gZAZJilJ4QLl8DVW6tc4uX xmIv8Nof604PciDkE1hRhU5pnxQ6VYtUOxesYyvGAW4N4OQOcZlLpO1xkqJSBbzCVexU XXNcWYJG2o0n4GWr2ABNT77ktb1SHqEktGgvgKpyBOGkNIm5BMBxjlrQFyyTS0QR1vuV TI6Do7NTRTPTPbhSMGPFaxKLX9PlJs3slqd2tadgjr/gTe9qgQUZPQPMvUKF5tO6nJTd qA2NpMlvyUqDvP7nRVVNsa7VsClJzbgJMKGNq8bKhVm3AC7cf6DmOfmSrKWHXjv/KzVn VxKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709676591; x=1710281391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iIAUoqwZw8jjQEXl/6GyiIUaJ3twVU9qfT6FoSeBtUo=; b=eiDVacJAgvAzcozhtS4OMWN/MoA78cJQZmTskQB/Nw3jiHhLnlPQSZJ1U8uYisAtzg yXyngrcQnko9tvnDAnE6FfzO5BwiqKyMIsreMlO3mMxrasna5C0QyyjXIWsQVWhXqLbz Cm3GJGqAXGe/IUvTegzJ98jEScQQKLeBEONebUO2smR1XRc/9sQglhgjfG8F9dpdiA77 /woLXdbmiGc1XGutGP2ullfHMocsnl73Rhd932FfFBZmsZLDk1TpSHuXcCaj0HeN5J/p xrU5t/czUJg08mtS1WhnogcwSxdGcQ8WgSD8Z/Xi9V4JFxaSDlPAHFgl4JkFIC230KPY HIPg== X-Gm-Message-State: AOJu0YxprilpeDswg16GdkS879wYNZdVlsJRznGA1vXOW0jvEyuJpT25 S83y0Tvyhk9tQIjM72nFwrXEAW3eFoeFusRZTNjlR0JVyaE8rKU1yFwe4znlKdp9T3tHXeD3pgG dnrA= X-Google-Smtp-Source: AGHT+IGaEw+XaJIT3CpIm8ByBxEgcEZcTCoy7C3krS1BcFFUCp8V/I/p4lcSOTyruOFGP0Skvw5WTw== X-Received: by 2002:a05:6122:220d:b0:4c8:90e5:6792 with SMTP id bb13-20020a056122220d00b004c890e56792mr3806749vkb.7.1709676591258; Tue, 05 Mar 2024 14:09:51 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.193]) by smtp.gmail.com with ESMTPSA id m11-20020ac807cb000000b0042e6be98dbasm2997038qth.31.2024.03.05.14.09.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Mar 2024 14:09:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Markus Armbruster , Paolo Bonzini , Beraldo Leal , Eric Blake , Marcel Apfelbaum , =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Manos Pitsidianakis , Wainer dos Santos Moschetta , Michael Tokarev , Yanan Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/2] meson: Make qemu-system binary installation optional Date: Tue, 5 Mar 2024 23:09:37 +0100 Message-ID: <20240305220938.85410-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240305220938.85410-1-philmd@linaro.org> References: <20240305220938.85410-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::935; envelope-from=philmd@linaro.org; helo=mail-ua1-x935.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org In order to allow qemu-system binaries to not be installed by default, add the 'install' key to target dictionaries in the execs[] array. Keep the current default: all binaries are installed. Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index c59ca496f2..51b995f4c7 100644 --- a/meson.build +++ b/meson.build @@ -3913,14 +3913,16 @@ foreach target : target_dirs 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', 'sources': files('system/main.c'), - 'dependencies': [] + 'dependencies': [], + 'install': true }] if host_os == 'windows' and (sdl.found() or gtk.found()) execs += [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', 'sources': files('system/main.c'), - 'dependencies': [] + 'dependencies': [], + 'install': true }] endif if get_option('fuzzing') @@ -3930,6 +3932,7 @@ foreach target : target_dirs 'win_subsystem': 'console', 'sources': specific_fuzz.sources(), 'dependencies': specific_fuzz.dependencies(), + 'install': true }] endif else @@ -3937,7 +3940,8 @@ foreach target : target_dirs 'name': 'qemu-' + target_name, 'win_subsystem': 'console', 'sources': [], - 'dependencies': [] + 'dependencies': [], + 'install': true }] endif foreach exe: execs @@ -3947,7 +3951,7 @@ foreach target : target_dirs endif emulator = executable(exe_name, exe['sources'], - install: true, + install: exe['install'], c_args: c_args, dependencies: arch_deps + deps + exe['dependencies'], objects: lib.extract_all_objects(recursive: true), From patchwork Tue Mar 5 22:09:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13583054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90A2BC54E41 for ; Tue, 5 Mar 2024 22:11:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhczA-0007CA-Ev; Tue, 05 Mar 2024 17:10:08 -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 1rhcz8-0007BA-HL for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:10:06 -0500 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhcz5-0000ks-9r for qemu-devel@nongnu.org; Tue, 05 Mar 2024 17:10:06 -0500 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-365337ad3e7so21022135ab.0 for ; Tue, 05 Mar 2024 14:10:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709676602; x=1710281402; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=21zKJQxHw+9tb6jPZxlDkMDIp2DGhnFvj5Ft9MckQvg=; b=OE7ATzcd+cEjryfuaB67UBdRZbqdC3pxd1nA3SOPhosiNJIN0POs7tk5ftFCvf9d7n j2MMppeStW5OmDUjhESEkfJ+VlFhi4itsr1u9+nYyffx9M3O27Dn1OQG+BcHADI7kO/z N/nfUXuql+IM/BZucELtPW0P5T2+C/4iCJhbMD01gmIYOYAEA+59PK6O0I1bOYI7Ydy8 m0CD+5z5wohD5u+dKv7zCv0ZEsWr/AM9LjWerfvBnO3EbYJmndtGAoq2seO7IA4dlBHS 8ybErdNC8M4lLoi9/aWxjVzaZsnm7q8lCno/U8m4wMvRQM1dXHmk7DgYfSZhSv3qDCSo OuqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709676602; x=1710281402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=21zKJQxHw+9tb6jPZxlDkMDIp2DGhnFvj5Ft9MckQvg=; b=RL1G16jO6NH/PY9abA4tePCTpXq275sxFJB1PffYrHiwnsgifVmThPvjc4kY+8H6We GeRHbCwzjQhdUOzKeP4HalpOQ2Zq1OHy5mtxTN9vpF+doVSWP7vwG2ZZLatttQCK2SZm b0WFrkO0u+Ioq6oF599Vd5dD85sZvYgqS1JEUfz4xGu38aPb7OnXOIFnAQJ80SmZGT43 avrpFRD1DYLO8/L/mKSI9vzXds39OPiccEfnm4XoP/sZuPPZ0cWZfHyAzIJoXgcI2ZqP bfJEiAtOnjob1fmRiZdW6tpIOde75yI4ZbRDXaT+zORqn8rv+cT9fZncR6cHgcOSfEyv LWdw== X-Gm-Message-State: AOJu0YxB5GtYVTCRWnrl6JRp85loCfJ7QN1YmjagxfhjzVRGTowQkMbg quqO29XASfVRb4oI6lyhVnm8TljMfpfVG4zMTVlz6FcUAnAXoKt4KGOsY1ocsxmBLQCyH9yjmGp ah1o= X-Google-Smtp-Source: AGHT+IG9f09X8p0k0lSKrcvRfGDebncx93ZV823RBVAytin4fHdukveCfwZEoqLQNCfT65gm8TUVeA== X-Received: by 2002:a05:6e02:17c5:b0:365:27ef:23d3 with SMTP id z5-20020a056e0217c500b0036527ef23d3mr18599007ilu.20.1709676601483; Tue, 05 Mar 2024 14:10:01 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.193]) by smtp.gmail.com with ESMTPSA id l15-20020a056e021aaf00b0036426373792sm3267112ilv.87.2024.03.05.14.09.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Mar 2024 14:10:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Markus Armbruster , Paolo Bonzini , Beraldo Leal , Eric Blake , Marcel Apfelbaum , =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Manos Pitsidianakis , Wainer dos Santos Moschetta , Michael Tokarev , Yanan Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/2] target: Add system emulation aiming to target any architecture Date: Tue, 5 Mar 2024 23:09:38 +0100 Message-ID: <20240305220938.85410-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240305220938.85410-1-philmd@linaro.org> References: <20240305220938.85410-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé Add the 'any'-architecture target. - Only consider 64-bit targets - Do not use any hardware accelerator (except qtest) - For architecture constants, use: . max of supported targets phys/virt address space . max of supported targets MMU modes . min of supported targets variable page bits Since this is an experiment, the binary is named 'x-qemu-system- diff --git a/configure b/configure index 3cd736b139..57f6c7038b 100755 --- a/configure +++ b/configure @@ -194,6 +194,7 @@ EXTRA_LDFLAGS="" # Distributions want to ensure that several features are compiled in, and it # is impossible without a --enable-foo that exits if a feature is not found. default_feature="" +target_system_any="" for opt do optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') @@ -693,6 +694,8 @@ for opt do ;; --without-default-features) # processed above ;; + --enable-experimental-system-binary-that-may-break-dont-do-this-distros) target_system_any="yes" + ;; --static) static="yes" ;; --host=*|--build=*|\ @@ -834,6 +837,9 @@ fi for config in $mak_wilds; do target="$(basename "$config" .mak)" + if [ "$target" = any-softmmu ] && [ "$target_system_any" != yes ]; then + continue + fi if echo "$target_list_exclude" | grep -vq "$target"; then default_target_list="${default_target_list} $target" fi diff --git a/configs/devices/any-softmmu/default.mak b/configs/devices/any-softmmu/default.mak new file mode 100644 index 0000000000..dab0ce770e --- /dev/null +++ b/configs/devices/any-softmmu/default.mak @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +CONFIG_ISA_BUS=y +CONFIG_PCI=y +CONFIG_PCI_DEVICES=y +CONFIG_I2C=y +CONFIG_TPM=y +CONFIG_NUBUS=y +CONFIG_VIRTIO=y diff --git a/configs/targets/any-softmmu.mak b/configs/targets/any-softmmu.mak new file mode 100644 index 0000000000..2c6cf1edd4 --- /dev/null +++ b/configs/targets/any-softmmu.mak @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +TARGET_ARCH=any diff --git a/meson.build b/meson.build index 51b995f4c7..a4fe9f23d0 100644 --- a/meson.build +++ b/meson.build @@ -3051,7 +3051,9 @@ foreach target : target_dirs if default_targets continue endif - error('No accelerator available for target @0@'.format(target)) + if 'any-softmmu' not in target_dirs + error('No accelerator available for target @0@'.format(target)) + endif endif actual_target_dirs += target @@ -3909,16 +3911,21 @@ foreach target : target_dirs name_suffix: 'fa') if target.endswith('-softmmu') + if target_name == 'any' + qemu_system_name = 'x-qemu-system-