From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923577212796.8400949775703; Sun, 19 Dec 2021 06:19:37 -0800 (PST) Received: from localhost ([::1]:40508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx2F-0000Me-Vj for importer@patchew.org; Sun, 19 Dec 2021 09:19:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx02-00063w-UJ for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:18 -0500 Received: from [2a00:1450:4864:20::534] (port=42674 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx01-0005wb-3S for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:18 -0500 Received: by mail-ed1-x534.google.com with SMTP id j21so23398479edt.9 for ; Sun, 19 Dec 2021 06:17:16 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EqOLSg8zg8I8UXoyrrO7ni1K5iZyGc8eZFN159xRpqY=; b=cuOxYg4/wWP/1CYN3KB1EADAqmbifPXlirCkuWocq46C3PPUzBUECsHY0v0+PzusqE V2lIU8k8bYh7uT+iIWgSppIweurRExqMpV/LlxpeYxumC4H9rcqZ2GeijjngmWUDDnyE L3sRS/O+TaqbHGG1GoAONUTIoEQZE5XAjXwKD985fTdOGBuMzG14WBsBLW4x74oZHGBg x5pkflKvI9ocmna0qU1z8yBIAmRDAdd8J5BnULEtwKrpKCfqbvyCiU6pckEVZvXpEfCT Vmj6l2F/qXwkk7mlp2UIIElmgjhjFLhMhV3JjYUx7MddLSrZSy654BdXsx+9sENtxho6 /eHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EqOLSg8zg8I8UXoyrrO7ni1K5iZyGc8eZFN159xRpqY=; b=taUXFh+e6Toy3R3xv6iN9ZGan+OJA/IcNusjPIIDWQQaiBsY7Hc0BxcIdjfoDfK4bj vucv/Lm1HhvOX1vZzLZx+lRBsv27W7cvjLuz0kNb0E9JqqgkmHqjbdCSeZOW63G4ha98 xlXXJsMDnuqVwc3qaRv7bJsU79sUl+qn9T5R2wOXLST4HiUY1njjL85SBnGEKRNUVHyy svLJm5nki4joge6V/j78wClcfayaBdgAcMBWrMwykjUAL4BHagirOaLckf0lOqVrL2Vs z4217UPbHJti90d5npxbDwUVzUzGl9uRVITFMou2czvnaUXFfLd1RDwuvj5sQGTVHPpu z62g== X-Gm-Message-State: AOAM5335GbQNLJdlfWwCbp/tTYAr/UxW62n3soW7mVPYwB9WWbqaHWlD ZwvYCKOMGPqDYgAqzthp3xh4SZJFWEw= X-Google-Smtp-Source: ABdhPJxcqswJKs9QfPePmBhG1XhLd7enqCh/ytFSkQRwHomsrzMAFEMtICQ9YlG2Zlqeq2bZcDP3BQ== X-Received: by 2002:a17:907:7b9b:: with SMTP id ne27mr9571869ejc.79.1639923434649; Sun, 19 Dec 2021 06:17:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/16] configure: make $targetos lowercase, use windows instead of MINGW32 Date: Sun, 19 Dec 2021 15:16:56 +0100 Message-Id: <20211219141711.248066-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923578448100003 Content-Type: text/plain; charset="utf-8" targetos is already mostly the same as Meson host_machine.system(), just in CamelCase. Adjust Windows, which is different, and switch to lowercase to match Meson. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 58 ++++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 28e1cf6291..e72e34b684 100755 --- a/configure +++ b/configure @@ -501,30 +501,30 @@ EOF } =20 if check_define __linux__ ; then - targetos=3D"Linux" + targetos=3Dlinux elif check_define _WIN32 ; then - targetos=3D'MINGW32' + targetos=3Dwindows elif check_define __OpenBSD__ ; then - targetos=3D'OpenBSD' + targetos=3Dopenbsd elif check_define __sun__ ; then - targetos=3D'SunOS' + targetos=3Dsunos elif check_define __HAIKU__ ; then - targetos=3D'Haiku' + targetos=3Dhaiku elif check_define __FreeBSD__ ; then - targetos=3D'FreeBSD' + targetos=3Dfreebsd elif check_define __FreeBSD_kernel__ && check_define __GLIBC__; then - targetos=3D'GNU/kFreeBSD' + targetos=3Dgnu/kfreebsd elif check_define __DragonFly__ ; then - targetos=3D'DragonFly' + targetos=3Ddragonfly elif check_define __NetBSD__; then - targetos=3D'NetBSD' + targetos=3Dnetbsd elif check_define __APPLE__; then - targetos=3D'Darwin' + targetos=3Ddarwin else # This is a fatal error, but don't report it yet, because we # might be going to just print the --help text, or it might # be the result of a missing compiler. - targetos=3D'bogus' + targetos=3Dbogus fi =20 # Some host OSes need non-standard checks for which CPU to use. @@ -532,7 +532,7 @@ fi # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in -SunOS) +sunos) # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then cpu=3D"x86_64" @@ -623,40 +623,40 @@ fi # OS specific =20 case $targetos in -MINGW32*) +windows) mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; -GNU/kFreeBSD) +gnu/kfreebsd) bsd=3D"yes" ;; -FreeBSD) +freebsd) bsd=3D"yes" bsd_user=3D"yes" make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; -DragonFly) +dragonfly) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -NetBSD) +netbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -OpenBSD) +openbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -Darwin) +darwin) bsd=3D"yes" darwin=3D"yes" # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" ;; -SunOS) +sunos) solaris=3D"yes" make=3D"${MAKE-gmake}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" @@ -665,11 +665,11 @@ SunOS) # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" ;; -Haiku) +haiku) pie=3D"no" QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" ;; -Linux) +linux) linux=3D"yes" linux_user=3D"yes" vhost_user=3D${default_feature:-yes} @@ -3334,8 +3334,8 @@ QEMU_GA_MSI_MINGW_DLL_PATH=3D"$($pkg_config --variabl= e=3Dprefix glib-2.0)/bin" # Mac OS X ships with a broken assembler roms=3D if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ - test "$targetos" !=3D "Darwin" && test "$targetos" !=3D "SunOS" &&= \ - test "$targetos" !=3D "Haiku" && test "$softmmu" =3D yes ; then + test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ + test "$targetos" !=3D "haiku" && test "$softmmu" =3D yes ; then # Different host OS linkers have different ideas about the name of the= ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. @@ -3903,15 +3903,7 @@ if test "$skip_meson" =3D no; then if test "$cross_compile" =3D "yes"; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross - if test "$mingw32" =3D "yes" ; then - echo "system =3D 'windows'" >> $cross - fi - if test "$linux" =3D "yes" ; then - echo "system =3D 'linux'" >> $cross - fi - if test "$darwin" =3D "yes" ; then - echo "system =3D 'darwin'" >> $cross - fi + echo "system =3D '$targetos'" >> $cross case "$ARCH" in i386) echo "cpu_family =3D 'x86'" >> $cross --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923578587182.95597222499134; Sun, 19 Dec 2021 06:19:38 -0800 (PST) Received: from localhost ([::1]:40630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx2H-0000R2-E6 for importer@patchew.org; Sun, 19 Dec 2021 09:19:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx03-000647-VX for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:19 -0500 Received: from [2a00:1450:4864:20::52c] (port=44974 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx01-0005wi-I7 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:19 -0500 Received: by mail-ed1-x52c.google.com with SMTP id z7so27711736edc.11 for ; Sun, 19 Dec 2021 06:17:17 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zEwHid1Zv0oXAk8+2KsA2jpvfbATiHDd8P3ZPEfNrVo=; b=bwxajoZBHFP2yk2838ahQJIdOZjohYIhwS8qlLFJSzi6Q0IpCKhzaCwVEAc9x8arS4 k0NnmW1RLj4S12j8d1W8x2a72Jj74W3wYrrVzHEgTLi842kcidlAyqCbb2DmO11pWwVB 2KnHURb0MUFDty2ZtnFazdfT2V6wvwJic2buC+oaecLhPYI8s8YVfY878pI/9beiuCkq KsmKxfneXBLOrRLAtiV9C2xbN0VW+PeBzUMb+PdD/ROWbN2In9U9Y9jwk2ZnTNUiPUWV J/o/Pzx6D4HpyPnhVQR8+pF6sfgvEgFYD71oeaR2uAcXTqP+xZXcYOYKZB5ETI1x4iCc E4DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zEwHid1Zv0oXAk8+2KsA2jpvfbATiHDd8P3ZPEfNrVo=; b=rJT8b198vPrUnYzBuBGlTtc0Oay+O51I57SEJKgIxgIOVe8HVQTcJQF39ilL4FR0Ti zElJ0odBastNIvk03m0bT3sgFetvzsTC/vu8MWqlLUCrKVMhmwkZ5ok+mdqXjPfshMqn zV8hTbAUvCXGN8qMyEf1fcHTphv8wAkMPByT0WG7r3dQyvDixV2PUhnQRjbGFMA0aRll yiV18Qf5dGPKA1UHoUPcrpmnZvCDjy0RSbuErT7NS6AMOhmvZ9GsG223bHLwVuPDzcNY 87wx1v7AnS/BsGCfXoNQpi/nnU6Is3xZkJiAA4DG0JsPMfhrtRp6Rv5+WnXElLFRo6NA b8+A== X-Gm-Message-State: AOAM533Wz7ryd/xNVSdptrVAXH2ufRKwr40+LXCGpH2ALpDvuwQlEURd PD+IttT1J0h04CwTjBnwek9PdefN/HM= X-Google-Smtp-Source: ABdhPJxuThFJrCk7dK5K7aDR+m4c9+rzbOcdlxygjL20x5idCIWHLnLOFwZBDkJ2KiA1AsskP1aC1w== X-Received: by 2002:a17:907:7fa2:: with SMTP id qk34mr9722010ejc.691.1639923436146; Sun, 19 Dec 2021 06:17:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/16] configure: move target detection before CPU detection Date: Sun, 19 Dec 2021 15:16:57 +0100 Message-Id: <20211219141711.248066-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923580069100007 Content-Type: text/plain; charset="utf-8" This makes more sense, since target detection can affect CPU detection on Solaris. Signed-off-by: Paolo Bonzini --- configure | 115 ++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/configure b/configure index e72e34b684..f0a82dd8f5 100755 --- a/configure +++ b/configure @@ -527,16 +527,67 @@ else targetos=3Dbogus fi =20 -# Some host OSes need non-standard checks for which CPU to use. -# Note that these checks are broken for cross-compilation: if you're -# cross-compiling to one of these OSes then you'll need to specify -# the correct CPU with the --cpu option. +# OS specific + case $targetos in +windows) + mingw32=3D"yes" + plugins=3D"no" + pie=3D"no" +;; +gnu/kfreebsd) + bsd=3D"yes" +;; +freebsd) + bsd=3D"yes" + bsd_user=3D"yes" + make=3D"${MAKE-gmake}" + # needed for kinfo_getvmmap(3) in libutil.h +;; +dragonfly) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +netbsd) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +openbsd) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +darwin) + bsd=3D"yes" + darwin=3D"yes" + # Disable attempts to use ObjectiveC features in os/object.h since they + # won't work when we're compiling with gcc as a C compiler. + QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" +;; sunos) + solaris=3D"yes" + make=3D"${MAKE-gmake}" + smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" +# needed for CMSG_ macros in sys/socket.h + QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" +# needed for TIOCWIN* defines in termios.h + QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo + # Note that this check is broken for cross-compilation: if you're + # cross-compiling to one of these OSes then you'll need to specify + # the correct CPU with the --cpu option. if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then cpu=3D"x86_64" fi +;; +haiku) + pie=3D"no" + QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" +;; +linux) + linux=3D"yes" + linux_user=3D"yes" + vhost_user=3D${default_feature:-yes} +;; esac =20 if test ! -z "$cpu" ; then @@ -620,62 +671,6 @@ if test -z "$ARCH"; then ARCH=3D"$cpu" fi =20 -# OS specific - -case $targetos in -windows) - mingw32=3D"yes" - plugins=3D"no" - pie=3D"no" -;; -gnu/kfreebsd) - bsd=3D"yes" -;; -freebsd) - bsd=3D"yes" - bsd_user=3D"yes" - make=3D"${MAKE-gmake}" - # needed for kinfo_getvmmap(3) in libutil.h -;; -dragonfly) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -netbsd) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -openbsd) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -darwin) - bsd=3D"yes" - darwin=3D"yes" - # Disable attempts to use ObjectiveC features in os/object.h since they - # won't work when we're compiling with gcc as a C compiler. - QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" -;; -sunos) - solaris=3D"yes" - make=3D"${MAKE-gmake}" - smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" -# needed for CMSG_ macros in sys/socket.h - QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" -# needed for TIOCWIN* defines in termios.h - QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" -;; -haiku) - pie=3D"no" - QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" -;; -linux) - linux=3D"yes" - linux_user=3D"yes" - vhost_user=3D${default_feature:-yes} -;; -esac - : ${make=3D${MAKE-make}} =20 # We prefer python 3.x. A bare 'python' is traditionally --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923576953342.031414248601; Sun, 19 Dec 2021 06:19:36 -0800 (PST) Received: from localhost ([::1]:40534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx2F-0000Nj-Fb for importer@patchew.org; Sun, 19 Dec 2021 09:19:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx03-000646-Vc for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:19 -0500 Received: from [2a00:1450:4864:20::531] (port=33308 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx02-0005wk-2s for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:19 -0500 Received: by mail-ed1-x531.google.com with SMTP id m21so608483edc.0 for ; Sun, 19 Dec 2021 06:17:17 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EXZ+RfndWTu7M8bnJezJV53DoYNGcawg43uOsLoxFZ0=; b=cuceh0TbfRqEgevzaWz/VlBzU5cdT7qMI0+3HXSj2SvYMMX9fcxaZBGjt3qD7pNWJ9 30p2NbTFYDO+8U84mAMCRidQ554Df2w/DNE9E7AGuVL8JSjBZ8YjwB/FjQDE1WTJlsy1 2ADknikDqbhuku6ombUSjQeGQ7Z6xX7UnlU6GJUITVbVOCm2lXGHb0WNW2TjHR5Pxlut seplbyx3ccl2ZrCC1tVbgRQJoto65Z/1DCQAywu4AL/AbVf6b7bHRj1rxWCzS7b8tdI9 ECTS5PoG0ynALaEeg71YSWAe/Y66dOaAg2pSwuaVSHqi5aiHWm0XiVT1ZMNGCPQv8g0x cSIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EXZ+RfndWTu7M8bnJezJV53DoYNGcawg43uOsLoxFZ0=; b=PSC7rv/5XzAC6/y7RMscgewwH86fCc03jP6QxBKY90uO4Cqzi2qY0GQ+h5mkbRZFs9 7xo6LEpVBu6AyQlRTigVCEoIFb2L4TbzATEyhjCfOEYkxWE/7k7DJIkg4dJBjUhlUHIY xDud38R82jbsNJZ0T6pFbddKlnXX0d/BizD2GD5b0Z51Z3wnnU75IsMpaFubXSoUCKJ0 LQluwoWwfz0B7s3SZl666HFmMvg5/eyuA37x2d8Q4Ygi84S3imYmiLsGciAZoMJlIg/7 V1n59NUe6ceezMIM6uhgLkbJbRMX++PVjC/yuFKMn6CEpa9EGyQZ4Gy4+dee7X5YJ9N3 VDLA== X-Gm-Message-State: AOAM533cI/QHynCEwVhxmxPFJjcJotXKXNVbtWXnm7NImGMJ3S4n3/c0 wK8RT9QoZMJWzyUuPFpZ+qn2qEgVVbQ= X-Google-Smtp-Source: ABdhPJxYSJi7pzebSymuFWza/rbAQs+t/Oi5O3w/XNd15PL995VYeWVmYcNK8gKuwvVN1RCXXmzQRg== X-Received: by 2002:a17:906:7e07:: with SMTP id e7mr4384852ejr.461.1639923436797; Sun, 19 Dec 2021 06:17:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/16] configure: unify two case statements on $cpu Date: Sun, 19 Dec 2021 15:16:58 +0100 Message-Id: <20211219141711.248066-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923578442100002 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 67 ++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/configure b/configure index f0a82dd8f5..77ccc15b73 100755 --- a/configure +++ b/configure @@ -636,32 +636,47 @@ else fi =20 ARCH=3D -# Normalise host CPU name and set ARCH. +# Normalise host CPU name, set ARCH and multilib cflags # Note that this case should only have supported host CPUs, not guests. case "$cpu" in - ppc|ppc64|s390x|sparc64|x32|riscv) - ;; - ppc64le) - ARCH=3D"ppc64" - ;; + aarch64|riscv) ;; + armv*b|armv*l|arm) + cpu=3D"arm" ;; + i386|i486|i586|i686|i86pc|BePC) cpu=3D"i386" - ;; + CPU_CFLAGS=3D"-m32" ;; + x32) + CPU_CFLAGS=3D"-mx32" ;; x86_64|amd64) cpu=3D"x86_64" - ;; - armv*b|armv*l|arm) - cpu=3D"arm" - ;; - aarch64) - cpu=3D"aarch64" - ;; + # ??? Only extremely old AMD cpus do not have cmpxchg16b. + # If we truly care, we should simply detect this case at + # runtime and generate the fallback to serial emulation. + CPU_CFLAGS=3D"-m64 -mcx16" ;; + mips*) - cpu=3D"mips" - ;; + cpu=3D"mips" ;; + + ppc) + CPU_CFLAGS=3D"-m32" ;; + ppc64) + CPU_CFLAGS=3D"-m64" ;; + ppc64le) + ARCH=3D"ppc64" ;; + + s390) + CPU_CFLAGS=3D"-m31" + ARCH=3Dunknown ;; + s390x) + CPU_CFLAGS=3D"-m64" ;; + sparc|sun4[cdmuv]) cpu=3D"sparc" - ;; + CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; + sparc64) + CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; + *) # This will result in either an error or falling back to TCI later ARCH=3Dunknown @@ -1252,24 +1267,6 @@ local_statedir=3D"${local_statedir:-$prefix/var}" firmwarepath=3D"${firmwarepath:-$datadir/qemu-firmware}" localedir=3D"${localedir:-$datadir/locale}" =20 -case "$cpu" in - ppc) CPU_CFLAGS=3D"-m32" ;; - ppc64) CPU_CFLAGS=3D"-m64" ;; - sparc) CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; - sparc64) CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; - s390) CPU_CFLAGS=3D"-m31" ;; - s390x) CPU_CFLAGS=3D"-m64" ;; - i386) CPU_CFLAGS=3D"-m32" ;; - x32) CPU_CFLAGS=3D"-mx32" ;; - - # ??? Only extremely old AMD cpus do not have cmpxchg16b. - # If we truly care, we should simply detect this case at - # runtime and generate the fallback to serial emulation. - x86_64) CPU_CFLAGS=3D"-m64 -mcx16" ;; - - # No special flags required for other host CPUs -esac - if eval test -z "\${cross_cc_$cpu}"; then eval "cross_cc_${cpu}=3D\$cc" cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923747729147.6533145120028; Sun, 19 Dec 2021 06:22:27 -0800 (PST) Received: from localhost ([::1]:49210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx50-0006IF-PM for importer@patchew.org; Sun, 19 Dec 2021 09:22:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx04-00064R-FY for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:20 -0500 Received: from [2a00:1450:4864:20::531] (port=43870 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx03-0005ws-33 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:20 -0500 Received: by mail-ed1-x531.google.com with SMTP id o20so27710090eds.10 for ; Sun, 19 Dec 2021 06:17:18 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0oYhIfTN9v9TVeQFHzicUForqk+cp6n+gOJjLlJ5g6A=; b=Xq8Gp1KUgUiNAYICZ+gDPVJu1hbtyaHTXuoJRQnnbgiLKl3DXAKkRlHJtyzipXEP24 tc0+NSAGNuAa996JHiJFtPTcPmUiYMCWGLz0L0Qpsb0cGdReo/WIklp1nmEIVtsH2sKj 3awdG0GlFmZZTPXnC3VMCzMqrylA4r1Hgj8I3TwoVCug7/qlifkYax80WWQgm/JdY1Gu +pmQa21rrar7gmEE7XRZA+pl0motGn0A/bRLIVWcpZIV3wXRMb2fetf9meDUTWaYdjQj n+VXeMyYm2odeiAzE+PcuX1hzjIUdEmq4cF0x3bArDK1LwBd/MZI3EdkIAK/w9v6OWkp 3CZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0oYhIfTN9v9TVeQFHzicUForqk+cp6n+gOJjLlJ5g6A=; b=2JAlunA7kyVbXUY8n7TltWYNS9+0yrZ0KwhR0X2Ybi/43apeFqhRWPhnhKbIrnLpUp DEmYjIWr7TvGspm+uYqfti2muP0URl2aT8pPmOr1uCxAeTrUsn/5CP+kqNy4qmzIii8S JlAzAM7Sno+/JGjfpEfmgGzz3NlK6Ksc+hW5yuC6LTTdxuJdu/iSLUm/n70TTdM8Azzg Qn1BWqldFYNZxxKjLGSWKaX04iuvDVs7zqy5lZ1ofQd6+yJxlrbnsmml3e6bWnBgGkKP U9KkUD0YaEfHbTBboOcx01OfgpAdQzvqsRvCLTEHfZD5fFNJH6nAhttXuqLg+Y+gOaWj 61Jg== X-Gm-Message-State: AOAM531Ghz903fkZZCn1ExNpVf2VizJPRHc3norM2xDkKJsXM7s0m/yk tIj7fmCNFYDkuPywM81tV8Pv2wG2hB4= X-Google-Smtp-Source: ABdhPJynH5/9DCNdd+uZe6Ns7Se8q25NSVN6Zb3Dj3M0WtVNaOSLJf2gboSJUTkdN91sNzoq9PQ1uw== X-Received: by 2002:a17:907:8a1b:: with SMTP id sc27mr2428378ejc.699.1639923437929; Sun, 19 Dec 2021 06:17:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/16] configure: unify ppc64 and ppc64le Date: Sun, 19 Dec 2021 15:16:59 +0100 Message-Id: <20211219141711.248066-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923748531100001 The only difference between the two, as far as either configure or Meson are concerned, is the default endianness of the compiler. For tests/tcg, specify the endianness explicitly on the command line; for configure, do the same so that it is possible to have --cpu=3Dppc64le on a bigendian system or vice versa. Apart from this, cpu=3Dppc64le can be normalized to ppc64 also in configure and not just in the meson cross file. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 10 ++++------ tests/tcg/configure.sh | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 77ccc15b73..85caf2e9ef 100755 --- a/configure +++ b/configure @@ -661,9 +661,10 @@ case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" ;; ppc64) - CPU_CFLAGS=3D"-m64" ;; + CPU_CFLAGS=3D"-m64 -mbig" ;; ppc64le) - ARCH=3D"ppc64" ;; + cpu=3D"ppc64" + CPU_CFLAGS=3D"-m64 -mlittle" ;; =20 s390) CPU_CFLAGS=3D"-m31" @@ -3721,7 +3722,7 @@ if test "$linux" =3D "yes" ; then i386|x86_64|x32) linux_arch=3Dx86 ;; - ppc|ppc64|ppc64le) + ppc|ppc64) linux_arch=3Dpowerpc ;; s390x) @@ -3903,9 +3904,6 @@ if test "$skip_meson" =3D no; then x86_64|x32) echo "cpu_family =3D 'x86_64'" >> $cross ;; - ppc64le) - echo "cpu_family =3D 'ppc64'" >> $cross - ;; *) echo "cpu_family =3D '$ARCH'" >> $cross ;; diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 9b76f58258..9ef913df5b 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -64,7 +64,9 @@ fi : ${cross_cc_ppc=3D"powerpc-linux-gnu-gcc"} : ${cross_cc_cflags_ppc=3D"-m32"} : ${cross_cc_ppc64=3D"powerpc64-linux-gnu-gcc"} -: ${cross_cc_ppc64le=3D"powerpc64le-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc64=3D"-m64 -mbig"} +: ${cross_cc_ppc64le=3D"$cross_cc_ppc64"} +: ${cross_cc_cflags_ppc64le=3D"-m64 -mlittle"} : ${cross_cc_riscv64=3D"riscv64-linux-gnu-gcc"} : ${cross_cc_s390x=3D"s390x-linux-gnu-gcc"} : ${cross_cc_sh4=3D"sh4-linux-gnu-gcc"} --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923738321773.6648340011984; Sun, 19 Dec 2021 06:22:18 -0800 (PST) Received: from localhost ([::1]:49088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx4r-0006DN-5l for importer@patchew.org; Sun, 19 Dec 2021 09:22:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx05-00067U-JV for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:21 -0500 Received: from [2a00:1450:4864:20::52e] (port=38626 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx04-0005xA-6S for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:21 -0500 Received: by mail-ed1-x52e.google.com with SMTP id bm14so14942499edb.5 for ; Sun, 19 Dec 2021 06:17:19 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BIxwQuAPeVNqTRU5r1xi3JNwh0IzfkblBxaFtKzuKjA=; b=pPXuD2rf9gCJgPVaAjZg1b9CSnSC2RmCG4uYbd7AvtWP/KQTQX6Zo6kbVM4UttsyBW WaG3FJ3Tl+iYpY4FZ0lCv/l8HrMg2C6DWVnnEa01/NaZ7ApMrzRMLeIhrSkDl9+Wm3a2 fiZnC2BLAXAV4NHdn2H4VuoiJkKaGAKhGchVWGbSfZMfakZcRcJtEaWnpCqWgoS5Vcnc Mpg40/8HcHGrf9qkSFzb52hd/0lyjskzap9j2mBuehuYQ1FgSZF4rpDRt6wh8HoGsRg9 9WfyQS51woy3GXWMzsfj+kUrKqgWBkF8uL6MWOlApg1v2s7oEjaxtL5mtG/tVvV+ZEwl eWnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BIxwQuAPeVNqTRU5r1xi3JNwh0IzfkblBxaFtKzuKjA=; b=WG4FOoql5vapSTvRoONcFQ2tkcl1KlfTEULY3Al9VwxrzG7jXjVTmEEKIjjdLrPURz T+nbbh54K0Y6kUFp2DgeiovT0/Bd5LmatdBNe4JIR/aU5vEGTifxGzxTm1FtV9nHV7qu 3HqOlkhIc7gv5S+vCDzHgrb4eZ1GRaEvTNlUwujW5C1Q6MG31Z7VATdvpLLch7W7itDH 2nNSqXvENQITtxP8NexPkqswWIWJZDVfvyHhaC5iTnmSHqUqnreQXj6LuCuH24Ds+cHI 5Vlld/o0bLOqcKMLjRX8LBVfVDdCgIcPMwsCdw4X0lW0H+7xXjqDgN2oUTVsJAbTy80C gXYA== X-Gm-Message-State: AOAM533DvUiEBQj/KcUCe3UOdI+tLE+ibpq6jj49KEVOd306Ps8y9snJ zU/ZlcNVTuO788KHRrHtdfkP/F3pU5s= X-Google-Smtp-Source: ABdhPJxHIqqfgKrvzYqHvkd73quP84vKu9Ay7lXh5wmk9iWwciq/xxx2EV9/8q7WDgZ2hEhjRBeM2g== X-Received: by 2002:a17:906:9b8e:: with SMTP id dd14mr9897343ejc.337.1639923438999; Sun, 19 Dec 2021 06:17:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/16] configure: unify x86_64 and x32 Date: Sun, 19 Dec 2021 15:17:00 +0100 Message-Id: <20211219141711.248066-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923739871100001 Content-Type: text/plain; charset="utf-8" The only difference between the two, as far as either configure or Meson are concerned, is in the multilib flags passed to the compiler. For QEMU, this fixes the handling of TYPE_OLDDEVT in include/exec/user/thunk.h and enables testing of dirty ring buffer, because both are using HOST_X86_64. For tests/tcg, this means that on a hypothetical x32 host the cross compiler will not be used to build the tests. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 6 ++---- meson.build | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 85caf2e9ef..108b7621e2 100755 --- a/configure +++ b/configure @@ -647,6 +647,7 @@ case "$cpu" in cpu=3D"i386" CPU_CFLAGS=3D"-m32" ;; x32) + cpu=3D"x86_64" CPU_CFLAGS=3D"-mx32" ;; x86_64|amd64) cpu=3D"x86_64" @@ -3719,7 +3720,7 @@ fi if test "$linux" =3D "yes" ; then mkdir -p linux-headers case "$cpu" in - i386|x86_64|x32) + i386|x86_64) linux_arch=3Dx86 ;; ppc|ppc64) @@ -3901,9 +3902,6 @@ if test "$skip_meson" =3D no; then i386) echo "cpu_family =3D 'x86'" >> $cross ;; - x86_64|x32) - echo "cpu_family =3D 'x86_64'" >> $cross - ;; *) echo "cpu_family =3D '$ARCH'" >> $cross ;; diff --git a/meson.build b/meson.build index ae67ca28ab..69cca2aa9f 100644 --- a/meson.build +++ b/meson.build @@ -355,7 +355,7 @@ if not get_option('tcg').disabled() tcg_arch =3D 'tci' elif config_host['ARCH'] =3D=3D 'sparc64' tcg_arch =3D 'sparc' - elif config_host['ARCH'] in ['x86_64', 'x32'] + elif config_host['ARCH'] =3D=3D 'x86_64' tcg_arch =3D 'i386' elif config_host['ARCH'] =3D=3D 'ppc64' tcg_arch =3D 'ppc' @@ -1806,7 +1806,6 @@ disassemblers =3D { 'hppa' : ['CONFIG_HPPA_DIS'], 'i386' : ['CONFIG_I386_DIS'], 'x86_64' : ['CONFIG_I386_DIS'], - 'x32' : ['CONFIG_I386_DIS'], 'm68k' : ['CONFIG_M68K_DIS'], 'microblaze' : ['CONFIG_MICROBLAZE_DIS'], 'mips' : ['CONFIG_MIPS_DIS'], --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923748508110.26957026595801; Sun, 19 Dec 2021 06:22:28 -0800 (PST) Received: from localhost ([::1]:49274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx51-0006Kn-JB for importer@patchew.org; Sun, 19 Dec 2021 09:22:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx08-0006EP-VM for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:24 -0500 Received: from [2a00:1450:4864:20::52e] (port=42670 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx07-0005xe-EV for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:24 -0500 Received: by mail-ed1-x52e.google.com with SMTP id j21so23399532edt.9 for ; Sun, 19 Dec 2021 06:17:23 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8imorrcfDdDuYqAEOd69k+qbFtbECFBVn2gu1jJv1fg=; b=WWaZHiEmVmlhSM9r6inC7z/WOs3JfAWB3TkUxczLfNJIq9+xlRvC47fnWOkAzPsopy bmGn02e1k0a/xzF7YkP9YZugATPRIbqQQnY1zpgaOwiq2ummD1mdYFht6+IMJ0FLNiKv DD6g6cVEJKQRBRkkUB9nVOZyC8t2UtraKR1l21S1gbfOmedU/0xjn3PTPHBZvpPoTN7G wzpupyAf+sK7JLopurgSFiYonQAEthoGAcngYAIMVdFZcrWAFHyeBsoOblOHKxFAaePH nqQFTWhUgnIMlLOT36uClViY63mWYGZ23OIH6PUf3StYw2k9tEzaMzPxZ0RbWIfvw98T byDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8imorrcfDdDuYqAEOd69k+qbFtbECFBVn2gu1jJv1fg=; b=v/8o6wZihZVKsCC3sx4xemPjn7S+r0LmILoiVkGoBGBQxgcZvjiJZG16ysOpBI7aaG SdYTHlAI4yLO+txF6B1BKYbd4LOdy7pxePrFFPpKoW2QRYi++hIF2Lq+9Zoc+aw0l+jN SDQmjMYBNLDsKrmKn3itqQBUflbiFV00yHaEqyxTfRcfIhzQV1ro7pYbZWynt6VC27N0 1q9nSFeVJ14kxCNnELFld4wtS0owuaLTyPuBJYT9bxTV9WRS6GFqO8tLtmALfRHljBoE Xn9QYaB/JgqeiuDn25n0azYpJgD1Is1NfwstKVtJTO91qe80JUQ9Qw12uSiQv76VKqsE QA3Q== X-Gm-Message-State: AOAM533bTLsOEmtemcUu+1LGOi3D1QC5WxgtLr7jsVeCFAo4iLTZxKA0 67+Q+9d9/Qdl8SkjBAFZ0mZjTAiDbmk= X-Google-Smtp-Source: ABdhPJz3R5Xk1lhsuGYYgUwSnaE6OWi9t/IC3WUzEoo6HiNsX+ZQelWxH72DuMoY/voj3FpOf8HQdA== X-Received: by 2002:aa7:c783:: with SMTP id n3mr11737799eds.121.1639923442166; Sun, 19 Dec 2021 06:17:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/16] meson: rename "arch" variable Date: Sun, 19 Dec 2021 15:17:01 +0100 Message-Id: <20211219141711.248066-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923750729100001 Avoid confusion between the ARCH variable of configure/config-host.mak and the same-named variable of meson.build. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 69cca2aa9f..4fdaa65b05 100644 --- a/meson.build +++ b/meson.build @@ -2850,7 +2850,7 @@ emulators =3D {} foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] - arch =3D config_target['TARGET_BASE_ARCH'] + target_base_arch =3D config_target['TARGET_BASE_ARCH'] arch_srcs =3D [config_target_h[target]] arch_deps =3D [] c_args =3D ['-DNEED_CPU_H', @@ -2866,11 +2866,11 @@ foreach target : target_dirs if target.endswith('-softmmu') qemu_target_name =3D 'qemu-system-' + target_name target_type=3D'system' - t =3D target_softmmu_arch[arch].apply(config_target, strict: false) + t =3D target_softmmu_arch[target_base_arch].apply(config_target, stric= t: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 - hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch + hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : target_base_arch hw =3D hw_arch[hw_dir].apply(config_target, strict: false) arch_srcs +=3D hw.sources() arch_deps +=3D hw.dependencies() @@ -2881,8 +2881,8 @@ foreach target : target_dirs abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' qemu_target_name =3D 'qemu-' + target_name - if arch in target_user_arch - t =3D target_user_arch[arch].apply(config_target, strict: false) + if target_base_arch in target_user_arch + t =3D target_user_arch[target_base_arch].apply(config_target, strict= : false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() endif @@ -2920,7 +2920,7 @@ foreach target : target_dirs arch_srcs +=3D gdbstub_xml endif =20 - t =3D target_arch[arch].apply(config_target, strict: false) + t =3D target_arch[target_base_arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923891757207.16358879484267; Sun, 19 Dec 2021 06:24:51 -0800 (PST) Received: from localhost ([::1]:57928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx7J-0003mx-Qj for importer@patchew.org; Sun, 19 Dec 2021 09:24:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx0A-0006KD-9w for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:26 -0500 Received: from [2a00:1450:4864:20::533] (port=39703 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx08-0005xi-NJ for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:26 -0500 Received: by mail-ed1-x533.google.com with SMTP id f5so4729542edq.6 for ; Sun, 19 Dec 2021 06:17:24 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TaFNVMQksgh8w5mOL9Z9nfCWfIMJtZ2x95nso2BUz2k=; b=J7uQ9vXeyBMry2BYZJCgyf5jol/5qIJNA2YWAmJVZIVMfOsOSK3ka1JixuVO6wPMLE FcD9pFR+M60BlkdDVW6voVe6aDyUyCqfi/KtAu+UZPc2S/1mzhxi79YzmKwSvJhHf4Ax RI7KIDEEUbe95MIeV3Qpn7xRqbIKpIdnvuWmPyLAykCvKUyXLau2tRhpigeQM2Sub5Sm +0pjSuHtYi0lERILSrTXMv6jPVgfo/o/Hq+qUXfmidUKAB9qnNTmXzr7irp3dlr5pNxs JRRL8trhYw07jZ0DRwxfFLf2+hFHVm4U0v74dwIPCFiom/AE3Hg3uk1+70b+gpCtOZsv tAUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TaFNVMQksgh8w5mOL9Z9nfCWfIMJtZ2x95nso2BUz2k=; b=J1zyvxjDze0Up3+f+q8tXLkpNzcY2OyaDp+yEBm8fN7aJArFr83OftSIPuzP2+ov+7 zRC7e1tuJtGp3KrJ/mcTqIylOZ0/exc+lkl/wnaAO+81tWHk0X8xFDGbm0AsVEJNKGD5 9X3uvwxM7kwDbXBBmd8Gi7/ol06Hlmw6xwRyOpZpaljLLfOKjFlUemw2ZEMch9IbFgDE rEv1o9l6Rhx3HbgQ4GhDdsRZMnUtBKMVmcdqPOeS/ozGqx8Rb18E4X9t9Na2sriq2KsN 48Oocv0z08loMhmb4H7OhpGN5gVjxFLiGhDzfLIwfgVzi/5MpHv4qaRGy91n1g55pKG8 I8VQ== X-Gm-Message-State: AOAM531ZWd2PZRdMXjb1vl80iIssrJD/GZVnUSFRg+diqYCntAu20BlW bcw+aHHkua3tM172nFV9Qeva3n3fEtI= X-Google-Smtp-Source: ABdhPJx3UnSmeAVE2Q4Dh3K8g9Ba70+p3KtwdbkLZfaSy7bPrzJP+2oZnj/bx2kU7DvQ8QxB0NCMLg== X-Received: by 2002:a17:907:3d88:: with SMTP id he8mr1613715ejc.239.1639923443382; Sun, 19 Dec 2021 06:17:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/16] configure, meson: move ARCH to meson.build Date: Sun, 19 Dec 2021 15:17:02 +0100 Message-Id: <20211219141711.248066-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923893391100001 Content-Type: text/plain; charset="utf-8" $ARCH and the HOST_* symbols are only used by the QEMU build; configure uses $cpu instead. Remove it from config-host.mak. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 21 ++++----------------- meson.build | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 108b7621e2..6e06ac6161 100755 --- a/configure +++ b/configure @@ -635,11 +635,9 @@ else cpu=3D$(uname -m) fi =20 -ARCH=3D -# Normalise host CPU name, set ARCH and multilib cflags +# Normalise host CPU name, set multilib cflags # Note that this case should only have supported host CPUs, not guests. case "$cpu" in - aarch64|riscv) ;; armv*b|armv*l|arm) cpu=3D"arm" ;; =20 @@ -668,8 +666,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m64 -mlittle" ;; =20 s390) - CPU_CFLAGS=3D"-m31" - ARCH=3Dunknown ;; + CPU_CFLAGS=3D"-m31" ;; s390x) CPU_CFLAGS=3D"-m64" ;; =20 @@ -678,15 +675,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; sparc64) CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; - - *) - # This will result in either an error or falling back to TCI later - ARCH=3Dunknown - ;; esac -if test -z "$ARCH"; then - ARCH=3D"$cpu" -fi =20 : ${make=3D${MAKE-make}} =20 @@ -3406,8 +3395,6 @@ echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action" >> $config_host_mak =20 -echo "ARCH=3D$ARCH" >> $config_host_mak - if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi @@ -3898,12 +3885,12 @@ if test "$skip_meson" =3D no; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross echo "system =3D '$targetos'" >> $cross - case "$ARCH" in + case "$cpu" in i386) echo "cpu_family =3D 'x86'" >> $cross ;; *) - echo "cpu_family =3D '$ARCH'" >> $cross + echo "cpu_family =3D '$cpu'" >> $cross ;; esac echo "cpu =3D '$cpu'" >> $cross diff --git a/meson.build b/meson.build index 4fdaa65b05..2495360fd0 100644 --- a/meson.build +++ b/meson.build @@ -67,6 +67,14 @@ endif =20 targetos =3D host_machine.system() =20 +if cpu not in supported_cpus + host_arch =3D 'unknown' +elif cpu =3D=3D 'x86' + host_arch =3D 'i386' +else + host_arch =3D cpu +endif + if cpu in ['x86', 'x86_64'] kvm_targets =3D ['i386-softmmu', 'x86_64-softmmu'] elif cpu =3D=3D 'aarch64' @@ -335,9 +343,9 @@ if targetos =3D=3D 'netbsd' endif endif =20 -tcg_arch =3D config_host['ARCH'] +tcg_arch =3D host_arch if not get_option('tcg').disabled() - if cpu not in supported_cpus + if host_arch =3D=3D 'unknown' if get_option('tcg_interpreter') warning('Unsupported CPU @0@, will use TCG with TCI (slow)'.format(c= pu)) else @@ -353,11 +361,11 @@ if not get_option('tcg').disabled() endif if get_option('tcg_interpreter') tcg_arch =3D 'tci' - elif config_host['ARCH'] =3D=3D 'sparc64' + elif host_arch =3D=3D 'sparc64' tcg_arch =3D 'sparc' - elif config_host['ARCH'] =3D=3D 'x86_64' + elif host_arch =3D=3D 'x86_64' tcg_arch =3D 'i386' - elif config_host['ARCH'] =3D=3D 'ppc64' + elif host_arch =3D=3D 'ppc64' tcg_arch =3D 'ppc' endif add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tc= g_arch, @@ -1426,6 +1434,8 @@ config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDI= R', get_option('prefix') / config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / q= emu_moddir) config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / ge= t_option('sysconfdir')) =20 +config_host_data.set('HOST_' + host_arch.to_upper(), 1) + config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) @@ -1775,8 +1785,6 @@ foreach k, v: config_host v =3D '"' + '", "'.join(v.split()) + '", ' endif config_host_data.set(k, v) - elif k =3D=3D 'ARCH' - config_host_data.set('HOST_' + v.to_upper(), 1) elif strings.contains(k) config_host_data.set_quoted(k, v) elif k.startswith('CONFIG_') @@ -1919,7 +1927,7 @@ foreach target : target_dirs endif =20 foreach k, v: disassemblers - if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) + if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].starts= with(k) foreach sym: v config_target +=3D { sym: 'y' } config_all_disas +=3D { sym: 'y' } @@ -2888,7 +2896,7 @@ foreach target : target_dirs endif if 'CONFIG_LINUX_USER' in config_target base_dir =3D 'linux-user' - target_inc +=3D include_directories('linux-user/host/' / config_host= ['ARCH']) + target_inc +=3D include_directories('linux-user/host/' / host_arch) endif if 'CONFIG_BSD_USER' in config_target base_dir =3D 'bsd-user' --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923887395220.6127772205782; Sun, 19 Dec 2021 06:24:47 -0800 (PST) Received: from localhost ([::1]:57668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx7G-0003c0-FL for importer@patchew.org; Sun, 19 Dec 2021 09:24:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx0C-0006Nx-2r for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:28 -0500 Received: from [2a00:1450:4864:20::52d] (port=42670 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx09-0005xq-L4 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:26 -0500 Received: by mail-ed1-x52d.google.com with SMTP id j21so23399812edt.9 for ; Sun, 19 Dec 2021 06:17:25 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZNUy718tEhPS2oilWcWnoZQhmSMv1tita41t/eNJPdw=; b=VVuhyGmn3EIjCXZiuvOF8O9UC9bz335AizvwJ0+g7ww86RcZV4usnSv5JttUMtegyX lHzZCF397pvIn0k2Jaeq3VA3x5fg5mLU36ca4i+WH3tekNzeK0LE7oaGOydCN6KdWNT4 4u2ev7u9EChc8K0tJKJC2WOzp7Qfyo40aVE1SrS4G0420K1mIiiUpr7vyjV97PB1Z9ZR ScLjxxjypdHm4pw2H0mh0Dd1o0xgxG/6HgoFJY0JMBO2p6ua5ZOPwm0B6JngY6BpIaPS 7ghuieZRXRA2a48JF12e6QeaqpNrSYFRNFy+FR/oiSBlu4XHQzIiDwSihKLB/AKAxc71 4kzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZNUy718tEhPS2oilWcWnoZQhmSMv1tita41t/eNJPdw=; b=GFC3hfGB8ipMjJHcXi22QevQDsKhzifkj/+n2I1GoqFZbbO8bUXIZFwX9DbCJzffY2 lfYVvOWTy1/M/ylgWzynWq8RMschR+NynMxlusD4SxPSy8lBHazjwPLlpVw5XXsMplb/ wiaqgkUbdD39C2A5oSun+7cRyQE6Ya67FcC6YrEiAEf9bC9fVBrz0xKJmOfoshII+b1f k6BADgINDr6MDNyxpw3110TALHCI2JIsUhx+kwQ8qMDycqT1ts8/SkKoj5XTI9Gb3AS/ g082kudHU0WIkeRUQXhFMRsrk0c5p6p63+ik5WxuSIuumN9xzEzrjhsVIGmFU0JnQ1tn ih7w== X-Gm-Message-State: AOAM530g7zt1agqI3rYBF0oD8AT0lFXI9fqhW5o8DLFyhCgdROqadsrw hLzIUhlvAdccqmrBx1voMbGhtozRK1o= X-Google-Smtp-Source: ABdhPJzFuN3hMv05WyA66JgZ+U2pXtj95Q2zHB4Z4M0nkoHqS9fc4iqD7QINzkxHXIFtHOB4IxBM3w== X-Received: by 2002:a17:907:16a8:: with SMTP id hc40mr7378501ejc.210.1639923444417; Sun, 19 Dec 2021 06:17:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/16] configure: remove unnecessary symlinks Date: Sun, 19 Dec 2021 15:17:03 +0100 Message-Id: <20211219141711.248066-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923889410100001 Content-Type: text/plain; charset="utf-8" Make pc-bios/meson.build use the files in the source tree as inputs to bzip2. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 1 - pc-bios/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 6e06ac6161..ba85bbb54b 100755 --- a/configure +++ b/configure @@ -3801,7 +3801,6 @@ for bios_file in \ $source_path/pc-bios/*.img \ $source_path/pc-bios/openbios-* \ $source_path/pc-bios/u-boot.* \ - $source_path/pc-bios/edk2-*.fd.bz2 \ $source_path/pc-bios/palcode-* \ $source_path/pc-bios/qemu_vga.ndrv =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b40ff3f2bd..1812a4084f 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -15,7 +15,7 @@ if unpack_edk2_blobs roms +=3D custom_target(f, build_by_default: have_system, output: f, - input: '@0@.bz2'.format(f), + input: files('@0@.bz2'.format(f)), capture: true, install: get_option('install_blobs'), install_dir: qemu_datadir, --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639924045884539.7371905068787; Sun, 19 Dec 2021 06:27:25 -0800 (PST) Received: from localhost ([::1]:37504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx9o-0000ha-QZ for importer@patchew.org; Sun, 19 Dec 2021 09:27:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx0F-0006cy-GN for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:31 -0500 Received: from [2a00:1450:4864:20::532] (port=39703 helo=mail-ed1-x532.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx0A-0005yC-OY for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:31 -0500 Received: by mail-ed1-x532.google.com with SMTP id f5so4729815edq.6 for ; Sun, 19 Dec 2021 06:17:26 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fdbRXvNu+/Gyf5YRvbOWHKtUQ4glJaVOj/ojGkMfKGo=; b=qqU02y/sHS3C4Tk4eRSJCrSK8cFnWeVHNoUEwGBzUxMjprCoG93Bsay4t7Q0NqH46L 9/kKUx2fxZmNqGdBylQEmysWx5QZmlo65tI6XIGVpOOJlfApdKmjxFGyx7hZGFd2xVUq ERWLaN9bf2a0CrlJP9dvybtfJtkUimTJng1IdyTW3kJngL/qeD7bWAhBgynr5JLYFDO+ QXKNGyFCH7YjxTcTS798vWkS0VqbfMXCVX+1zskjlQHMHbFSRZsuuEN40ZvJY+u6BYJc EKmbX57U7pFrJc0LEoEUmO4WCFcvvu4oFHqaMpFeRSWLVIe5+HBPHD5HNoy5UKM3E06S qjQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fdbRXvNu+/Gyf5YRvbOWHKtUQ4glJaVOj/ojGkMfKGo=; b=QTVLxglVpJN5X9fc8Ywi6jjcVZAeFSzQynkhVLPTZle5dVbzsXrMU0Tveaxfy7DYl1 c4dklTrd3pPnv1wZBEQWmob/QZ/N+g1+BfoMYF1nftPxYdsMxadMlvfAEpOIl8Aw841J KxhbREP3PoSKaa45b5dwqOHlER/KH0YbGnzxo69Ea/pYfhOKrH8j8gGOpdWecDdx+9NT FZWyJV79Y54jYJtge35gDeoW2jiPdAu2+w2pEkVfTohSLLU5FMO+tWWAmrL4P8CwGdli lYnNlfj3U8iTO/PI3iR4J1UXCwQ3MC05SeeHwsrZk50fOzPzsPrqz7TLUd+gsXIhCvoL +wVw== X-Gm-Message-State: AOAM532649PYfrkqWHgxBwDFENURU2gcSlCp3+jCbczJWSwVRXRujkw7 Qhyoq6dmA8IVr4s0xIwKg5fo3tbICMk= X-Google-Smtp-Source: ABdhPJyWa2jD2w4pZLDn6ANCagSYNNkQBDz1zYAC9sNwPiCs7LFn77Xf7yqA91Q1HIjeOJODsQWIkQ== X-Received: by 2002:a17:907:2da3:: with SMTP id gt35mr2302882ejc.704.1639923445524; Sun, 19 Dec 2021 06:17:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/16] configure: remove DIRS Date: Sun, 19 Dec 2021 15:17:04 +0100 Message-Id: <20211219141711.248066-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::532 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639924047136100001 DIRS is used to create the directory in which the LINKS symbolic links reside, or to create directories for object files. The former can be done directly in the symlinking loop, while the latter is done by Meson already, so DIRS is not necessary. Reviewed-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini --- configure | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure b/configure index ba85bbb54b..8ccfe51673 100755 --- a/configure +++ b/configure @@ -3762,7 +3762,6 @@ if test "$safe_stack" =3D "yes"; then fi =20 # If we're using a separate build tree, set it up now. -# DIRS are directories which we simply mkdir in the build tree; # LINKS are things to symlink back into the source tree # (these can be both files and directories). # Caution: do not add files or directories here using wildcards. This @@ -3774,12 +3773,6 @@ fi # UNLINK is used to remove symlinks from older development versions # that might get into the way when doing "git update" without doing # a "make distclean" in between. -DIRS=3D"tests tests/tcg tests/qapi-schema tests/qtest/libqos" -DIRS=3D"$DIRS tests/qtest tests/qemu-iotests tests/vm tests/fp tests/qgrap= h" -DIRS=3D"$DIRS docs docs/interop fsdev scsi" -DIRS=3D"$DIRS pc-bios/optionrom pc-bios/s390-ccw" -DIRS=3D"$DIRS roms/seabios" -DIRS=3D"$DIRS contrib/plugins/" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" @@ -3807,9 +3800,9 @@ for bios_file in \ do LINKS=3D"$LINKS pc-bios/$(basename $bios_file)" done -mkdir -p $DIRS for f in $LINKS ; do if [ -e "$source_path/$f" ]; then + mkdir -p `dirname ./$f` symlink "$source_path/$f" "$f" fi done --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639924051041320.48205086572125; Sun, 19 Dec 2021 06:27:31 -0800 (PST) Received: from localhost ([::1]:37616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx9u-0000mB-2G for importer@patchew.org; Sun, 19 Dec 2021 09:27:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx0D-0006Sb-3V for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:29 -0500 Received: from [2a00:1450:4864:20::52b] (port=46036 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx0B-0005yO-Mk for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:28 -0500 Received: by mail-ed1-x52b.google.com with SMTP id j6so7227123edw.12 for ; Sun, 19 Dec 2021 06:17:27 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Va7aH7F5wNzj4tqTVDznAbDfwrxer3zFu8LqmVshp8Y=; b=ZINGattT6BJ0XsOPuyDpadzOpDf/oV3O1AHlUF69MJ/FrpX+HEYha1VXF5AUHQulNU TxfmXSNyHHPilY7wvEAg+nBjcPbKgNtiYrQE/Wn+Bj1I2YZDvAcmeeG9mhA1H2UNnh1Y e9zi955OdeH1kyrRgWiz9Wbw0gOB17zfgLw3LvM+PZDF6fVjGyJfMVE181qknPKgKmeL t9fpAEjRMcIAJi9kN9xjS1gDprj45Bx+/b3H3sbZmAjT1fwdkr1a0ItDBXPdFWt+SL2O S/sbELZlb54Vt0e9yj8NgRKtnW44XYvsRRjjgGMfMH9A7L+3w+kVKgCy6S7AmLymO3v1 AUCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Va7aH7F5wNzj4tqTVDznAbDfwrxer3zFu8LqmVshp8Y=; b=2PXNwBKRsTywe11NBTtpi4PevjZ/A6bbwVgH7ldSQHfcDvYIers1v0KD7g/cscrzCX w8rvmOKe9b845XHFAZvuoxM7zZuWJMWpytXZQz68RL/d7OZ5MaE3WSJb5v1XEoa0ign0 54/Iv4wr0T+6NfLCBDLYkyJ5FXD94Np0LAcevFUeNoNM1usJl5pm1He+qK8O0tMQ1ZBw 8uq25RKCmaQgNLHq+mHj/I0+5dH6ZvtHtN4aSFkztxFsLfvduB6GfmAH68LPSHTuDCDP xoIflxtgCL2+hKUX2vJ9JW0nnuIx+nMMTHtLW68XSEB81PPEEhKk6QLlUi9qdxy1Zns8 33gw== X-Gm-Message-State: AOAM533+z3xNVNulY5ZJy3c3LlVbD0N6hh62tbWlNseRjC0JNH/H3aMr djHZHMq29ws3O6RUiamDfDKacxDj010= X-Google-Smtp-Source: ABdhPJwXvD1Ytj8w2oR3NcnjoDASKeE3rLIXv1mB/t/hCg8Ci9B0PQzFRwXRt7E9s2Jfq95XtOzrVw== X-Received: by 2002:a17:906:c214:: with SMTP id d20mr9730834ejz.630.1639923446507; Sun, 19 Dec 2021 06:17:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/16] meson: reenable test-fdmon-epoll Date: Sun, 19 Dec 2021 15:17:05 +0100 Message-Id: <20211219141711.248066-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639924051305100001 Content-Type: text/plain; charset="utf-8" The test was disabled when CONFIG_EPOLL_CREATE1 was moved out of config-host.mak. Fix the condition. Signed-off-by: Paolo Bonzini --- tests/unit/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build index acac3622ed..90acf5b0da 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -112,7 +112,7 @@ if have_block if nettle.found() or gcrypt.found() tests +=3D {'test-crypto-pbkdf': [io]} endif - if 'CONFIG_EPOLL_CREATE1' in config_host + if config_host_data.get('CONFIG_EPOLL_CREATE1') tests +=3D {'test-fdmon-epoll': [testblock]} endif endif --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923890679899.1227778762046; Sun, 19 Dec 2021 06:24:50 -0800 (PST) Received: from localhost ([::1]:57844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx7J-0003jY-6X for importer@patchew.org; Sun, 19 Dec 2021 09:24:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx0E-0006Xo-85 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:30 -0500 Received: from [2a00:1450:4864:20::536] (port=41687 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx0C-0005yY-T4 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:29 -0500 Received: by mail-ed1-x536.google.com with SMTP id g14so27758047edb.8 for ; Sun, 19 Dec 2021 06:17:28 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rrAIemtb4192qfSOVxsRbeF+XjROxaOak0qG0wpLn8A=; b=AKAiAlrmhNUV8Qk/NB+gigdmQhiu8Wo84Z1vhMA1aLeM6la+rmnABjWghr2wVPO1wL fm2m5Mq6DzrSGNtXK3QS1VZMZ2GDYCMJwCWpBaMkwB96LNEX8zOyXWIVcCnTExx4kW3k 2qdLFbf2tFE+QmJcK1guk0+OCZ/+RTo5VDeu6JOjGJLH4nfDIwbLSu//RkgEbtcR6iP9 a2TO+cYMEnY9ShXy+rsTarzFIGFmfCYj9KS111q4mR6nq6KNpF5PUoM+2lYbmR0EHqn6 RYJ/ExgHkAUukXCRuTkKGn1KpAsRdhWW9TqhA1q2I+ZFt2GGg6KcTXO1hzFA/er0Li8c g59g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rrAIemtb4192qfSOVxsRbeF+XjROxaOak0qG0wpLn8A=; b=knhrIpoQlfnagHSwbtDdFEFlOT3wYyzGLhCpPeSWWVl+JtpQ4B78KY2M3kU3Jz29R9 kHW9RuBptIDAJeJ6goy4qtbRsAdTh8NF9vPUC8G/eWU0SGY7S2Jjckkx8dtEnkkau8hm refNGmRXSotuX2p69kof+GO095Qjn4OhAlCoWLd9nqizqjUtoWqZC2sq9M3feyMbFClX vq3lD0YBVBCS33l7g2MesmivrRhmPYbf73j8RmF4I/hOVVDpZZzOmpCkQ++Rcyzb1j6r gVE4H1cjNKp2uxxEswJyyOkEqrLfH8e1L+nKo7KEJORNLGrItzd3M6t4WWp9ase7pzDa 3DIw== X-Gm-Message-State: AOAM533BJ3Zl7xxswtjd/SK5jkgXWTmSw0tUUwqHcZZ9DH0BECF1Qnl7 iZp2If3QcfjlQRnkkvxMLBNJ/KsXRxc= X-Google-Smtp-Source: ABdhPJxBcl5Q2fkgMqPZbI3sCm3tHm4t4sXWclyjim8Ifa9aouPT9yB26+NCsUu2Kr72+JNvkfyDqQ== X-Received: by 2002:a17:907:8a07:: with SMTP id sc7mr1077205ejc.738.1639923447624; Sun, 19 Dec 2021 06:17:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/16] cpu: remove unnecessary #ifdef CONFIG_TCG Date: Sun, 19 Dec 2021 15:17:06 +0100 Message-Id: <20211219141711.248066-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923891311100003 Content-Type: text/plain; charset="utf-8" "if (tcg_enabled())" allows elision of the code inside it; we only need the prototype to exist, so that the code compile even for the --disable-tcg case. Signed-off-by: Paolo Bonzini --- cpu.c | 5 ----- include/exec/cpu-all.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/cpu.c b/cpu.c index 9bce67ef55..945dd3dded 100644 --- a/cpu.c +++ b/cpu.c @@ -137,12 +137,10 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) if (!accel_cpu_realizefn(cpu, errp)) { return; } -#ifdef CONFIG_TCG /* NB: errp parameter is unused currently */ if (tcg_enabled()) { tcg_exec_realizefn(cpu, errp); } -#endif /* CONFIG_TCG */ =20 #ifdef CONFIG_USER_ONLY assert(qdev_get_vmsd(DEVICE(cpu)) =3D=3D NULL || @@ -169,12 +167,9 @@ void cpu_exec_unrealizefn(CPUState *cpu) vmstate_unregister(NULL, &vmstate_cpu_common, cpu); } #endif -#ifdef CONFIG_TCG - /* NB: errp parameter is unused currently */ if (tcg_enabled()) { tcg_exec_unrealizefn(cpu); } -#endif /* CONFIG_TCG */ =20 cpu_list_remove(cpu); } diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 3c8e24292b..bb37239efa 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -437,12 +437,10 @@ void dump_opcount_info(GString *buf); =20 #endif /* !CONFIG_USER_ONLY */ =20 -#ifdef CONFIG_TCG /* accel/tcg/cpu-exec.c */ int cpu_exec(CPUState *cpu); void tcg_exec_realizefn(CPUState *cpu, Error **errp); void tcg_exec_unrealizefn(CPUState *cpu); -#endif /* CONFIG_TCG */ =20 /* Returns: 0 on success, -1 on error */ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923795120171.97549524928797; Sun, 19 Dec 2021 06:23:15 -0800 (PST) Received: from localhost ([::1]:51916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx5m-00086v-5A for importer@patchew.org; Sun, 19 Dec 2021 09:23:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx2q-0003Yt-AU for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:12 -0500 Received: from [2a00:1450:4864:20::530] (port=40627 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx2o-0006M5-L3 for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:11 -0500 Received: by mail-ed1-x530.google.com with SMTP id z29so27732481edl.7 for ; Sun, 19 Dec 2021 06:20:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y19sm5791584edc.17.2021.12.19.06.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=azhbmIZqW98hG0qRoHQgPRaAObJk9PmmGoz4t4gIIm0=; b=OQg+TOcRQRcyxZ5XgCpRtjW5UmJDnezS1B0EPH11l2RlVXAiWl0izZbzL5C6yiIBxZ KA6grR/BHkq+9JtXx/lMaI4vRBCiOclZ/gPaBYKi4o+lK88g1XdTzUQADmF4Vwy5AHbM 8EGgcpj2Zgltrxo1DrFYTbVH+9eBm2ZcKQi6x54kYwlWWBTCjgiiiqGQ+fIzyy9+dDrW KI2tcmCpekBsacG2V3ywh/EUo+WeDTOZgDX6YowiIJ79g5xNW0ZdmG/PgZ+JNPhhtVc0 IrX7iZoewE6qtT0fBzItoTi9gAd1E1GLwcraQXXPEPSpWMuY50CQAtGEjWOCIjr6cFNV oA+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=azhbmIZqW98hG0qRoHQgPRaAObJk9PmmGoz4t4gIIm0=; b=GzTOaOma5Ev2ahZJqVb/DeWClmM1/fjwtyr0fWDW6xdzqW7wJQz9yOdFVVhfDT5BmQ iqm3ROcuTUBE0J/VrVuujbo4r90epYOzeDxLASlR6vJn3dBMZwxmO/PtecX1Q8LgBBy8 k3WjG5PpRGLNdbX0+gR6jx7fTrKHO3U7sotN7jY2fxOr4jhL30E0Rd7RVSQLB7UKyy+f /nzTFardg8fZoOsn3zkl4TxfA7M91SycL6stzPzEerXhoVChftvM2m29rHASQYPQHRvh jNKfx2QnTO9n7Uk1eYZF4hCdxfWQYPUng5bdk+/8yxm614u0BcIV9/Q4XDvJ9hht4Yvf aaHA== X-Gm-Message-State: AOAM5302fQ+6ICuCDclp0gdEQA/tIf/dv21ToamHTmneoBDgpwPljETq m5G2SpsS8KiFcuZSiV1EiXXLoQzIPsA= X-Google-Smtp-Source: ABdhPJyE+O4F8pljTkv+K2QVM3WDp49QUnlt52HXQF3JT+00EKK3dUwgjLXHNv84au6CiaPFMN6GYg== X-Received: by 2002:a17:906:5488:: with SMTP id r8mr9605951ejo.752.1639923609286; Sun, 19 Dec 2021 06:20:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/16] meson: add "check" argument to run_command Date: Sun, 19 Dec 2021 15:20:04 +0100 Message-Id: <20211219142008.248807-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923796516100001 Meson is planning to change the default of the "check" argument to run_command (from false to true). Be explicit and include it in all invocations. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- docs/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 27c6e156ff..57b28a3146 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -18,12 +18,12 @@ if sphinx_build.found() # This is a bit awkward but works: create a trivial document and # try to run it with our configuration file (which enforces a # version requirement). This will fail if sphinx-build is too old. - run_command('mkdir', ['-p', tmpdir / 'sphinx']) - run_command('touch', [tmpdir / 'sphinx/index.rst']) + run_command('mkdir', ['-p', tmpdir / 'sphinx'], check: true) + run_command('touch', [tmpdir / 'sphinx/index.rst'], check: true) sphinx_build_test_out =3D run_command(SPHINX_ARGS + [ '-c', meson.current_source_dir(), '-b', 'html', tmpdir / 'sphinx', - tmpdir / 'sphinx/out']) + tmpdir / 'sphinx/out'], check: false) build_docs =3D (sphinx_build_test_out.returncode() =3D=3D 0) =20 if not build_docs --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639924203815889.8988262066234; Sun, 19 Dec 2021 06:30:03 -0800 (PST) Received: from localhost ([::1]:42388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myxCM-00047R-LP for importer@patchew.org; Sun, 19 Dec 2021 09:30:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx2r-0003bl-HC for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:13 -0500 Received: from [2a00:1450:4864:20::52f] (port=37581 helo=mail-ed1-x52f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx2p-0006MO-3t for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:13 -0500 Received: by mail-ed1-x52f.google.com with SMTP id e3so27848384edu.4 for ; Sun, 19 Dec 2021 06:20:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y19sm5791584edc.17.2021.12.19.06.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xDwweGBWt7zYTH3DzYQOaKZ+/j+vUNSBNMZBpH7Nrkc=; b=pOr3IKagJSkLL6LIMkWQtYsORJIyrfDT/E84Vv7Ag/hYOqKvztGXPUXU7pMTlXziix NVKS1xl5Ld5XGIRQ7p9Xl/FzkyTmOeKajolb0jFlOBvDr5Kk5aacdap+2d6HOw0EDamG 0u0aGkXI8THoBmmMXM1jwMjudzv3i4B3BfZ+ss4TemrDsFYtgOjzPU5Vrqct7/6aGwQS 4ruAxWXOMKGHKUuUkTX/qmRbs2O3KcxYSihlcIbKejPq84SMDJZwO5Y0cXzmP+2bMbFh /KFthBUIiq9QjT8RFyZnRscf3ouGkICdQsUS3IpbwDwLcp+vffAiq8mUnr5TUpJU4D7W mghA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xDwweGBWt7zYTH3DzYQOaKZ+/j+vUNSBNMZBpH7Nrkc=; b=CXvvbTBmvAbqjHTmcl/4LFat+uC1lRFsxDUZbo/jrsNW+MGxwrb68tRlYW4qDjSHEc hDLErnLivvEokP60el5DWKOQl6V1FoAGysJROd3oj8dgAeAhdZ46kKg+Q135U7gkVvLg GLi07MXgTXw+DZvvxUUKtKAhgzjmXlejBLUO6vRKjfDl4auz8wrtcqC993CdmQfraOtX 17ECIoUACpsYkDCn6v4z2N6pT7ijrWogIlquWctpwA2cpgbDo/71hi974vTCRo6oBtAv q6vrVte9G6v3OfHzS0GyWZr+ePPuR12bteCBNIgDAF4zuyKTqQ9DDHtObUSUiHhBicIy xQaQ== X-Gm-Message-State: AOAM530+yIaAY093OcsXglr6odBIMF7iTGnNDKs0xKH4AEWGKlaN2Md6 ZGiX2WATluH9VB4Wihvb96cWST4CuiI= X-Google-Smtp-Source: ABdhPJw3l+Qvutr6gEx9jY15WCrR4p4sI+x0pSVoYw5UD5xlqJdQcjF2fxdAzdBBaXp5mQIm69X2EA== X-Received: by 2002:a05:6402:2ce:: with SMTP id b14mr11353066edx.122.1639923609887; Sun, 19 Dec 2021 06:20:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/16] hw/scsi: Fix scsi_bus_init_named() docstring Date: Sun, 19 Dec 2021 15:20:05 +0100 Message-Id: <20211219142008.248807-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52f (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639924206093100001 From: Philippe Mathieu-Daud=C3=A9 Commit 739e95f5741 ("scsi: Replace scsi_bus_new() with scsi_bus_init(), scsi_bus_init_named()") forgot to rename scsi_bus_init() in the function documentation string. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211122104744.1051554-1-f4bug@amsat.org> Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- include/hw/scsi/scsi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index a567a5ed86..2ef80af6dc 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -158,7 +158,7 @@ struct SCSIBus { * provided by the caller. It is the caller's responsibility to make * sure that name does not clash with the name of any other bus in the * system. Unless you need the new bus to have a specific name, you - * should use scsi_bus_new() instead. + * should use scsi_bus_init() instead. */ void scsi_bus_init_named(SCSIBus *bus, size_t bus_size, DeviceState *host, const SCSIBusInfo *info, const char *bus_name); --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923944440978.5661338495767; Sun, 19 Dec 2021 06:25:44 -0800 (PST) Received: from localhost ([::1]:60428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx8B-0005SW-BN for importer@patchew.org; Sun, 19 Dec 2021 09:25:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx2s-0003ex-6z for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:14 -0500 Received: from [2a00:1450:4864:20::52b] (port=40623 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx2q-0006Mi-JC for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:13 -0500 Received: by mail-ed1-x52b.google.com with SMTP id z29so27732721edl.7 for ; Sun, 19 Dec 2021 06:20:12 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y19sm5791584edc.17.2021.12.19.06.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:20:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bxjewu8xAoe2o5vKu5a0q8tM8PGVblCdED+dQbhjA90=; b=KpwyBeBzUjf6VcMUH36iBZCSbeJBSrIVMbbDe1a2/nfMhakVjvFjFqMKFk44Kb3fki NhNJKEiU9VQkj/4tLijtUlGJKItlo6wFynLfKb7ChokTs6Roh4elUio4lqscA0IQ9sGB EXhETZEExE5FpuisExNHJWzg/BMUC5a2VyWHIF7WC336jaKDnL+6SQxpP8cONBrv7z/M FF0cgbExII9Ec9ndJDp3T8zoHqvBY583P2pf0fWceRL10jRgK0HBI1OGUi1Jis4431B+ Cf1YD0NMqsrXOHrATC//jR8UPY9eCdwWTyr9ikcWH7aL9sB4SFxrhz8/klYcBz4ddQRZ vwCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bxjewu8xAoe2o5vKu5a0q8tM8PGVblCdED+dQbhjA90=; b=6fKxDobW/qvG4HjJhYo9WxiMkK45OZZ+1lHbtBQMPhH/3HbbB/V9+5wpNKrQoAJrQb T5sZzId+FocqDa2j3zRfieO52fUSUIYWFcZl8d7swZSpPxhoLjoOKyl/zKfB8Hy1I3bN UZ4O2bvVtR1IcJWU92xF745yQHZCfsD3aOXpWvOMipah5ljNeW5jgTAlGbe/3vTLeKFn oLQZU/9hGkTmrNtw03voc5nDitbemATmvUS/FIpDmgOkJ8SaqM9WDw4hDY7mR7qZ14PJ B46yQQRT90/9mraZABQSmtDHoJFFvkWy5gLUSvRG+SnBYQFTbL8L9An9M0hvtNrU9Tmi lROA== X-Gm-Message-State: AOAM532VeyNnQXwW/hmGgk8q/fihlHrF26eblVz8GNmRQhgVObGGVRmY +85j1DmZ1Mw4iTdAsfPn19wocKy6QZc= X-Google-Smtp-Source: ABdhPJwV+8bwsHIf8xjJdrECGs0ER+lhfIveEYul0Qcuj+SMZ4an9ot1k4eirFYDS7vrhjJlXVe97A== X-Received: by 2002:a17:907:1b11:: with SMTP id mp17mr9535148ejc.374.1639923611429; Sun, 19 Dec 2021 06:20:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/16] hw/scsi/megasas: Fails command if SGL buffer overflows Date: Sun, 19 Dec 2021 15:20:06 +0100 Message-Id: <20211219142008.248807-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Darren Kenny Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923945560100001 From: Philippe Mathieu-Daud=C3=A9 If we detect an overflow on the SGL buffer, do not keep processing the command: discard it. TARGET_FAILURE sense code will be returned (MFI_STAT_SCSI_DONE_WITH_ERROR). Reported-by: Alexander Bulekov Resolves: https://gitlab.com/qemu-project/qemu/-/issues/521 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Darren Kenny Message-Id: <20211119201141.532377-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/megasas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 4ff51221d4..8f35784100 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -303,6 +303,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd = *cmd, union mfi_sgl *sgl) } if (cmd->iov_size > iov_size) { trace_megasas_iovec_overflow(cmd->index, iov_size, cmd->iov_size); + goto unmap; } else if (cmd->iov_size < iov_size) { trace_megasas_iovec_underflow(cmd->index, iov_size, cmd->iov_size); } --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639924401474186.50993344056315; Sun, 19 Dec 2021 06:33:21 -0800 (PST) Received: from localhost ([::1]:46688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myxFY-0007KI-HD for importer@patchew.org; Sun, 19 Dec 2021 09:33:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx2t-0003iK-9B for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:16 -0500 Received: from [2a00:1450:4864:20::534] (port=47017 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx2r-0006Mw-Gr for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:14 -0500 Received: by mail-ed1-x534.google.com with SMTP id y13so27698489edd.13 for ; Sun, 19 Dec 2021 06:20:13 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y19sm5791584edc.17.2021.12.19.06.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:20:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eUgIGypOvlxmVLkE+IKIHLkcbtFMyPVsMQpyrCGpfZw=; b=N7wftzlwpOUUbKAf/xWcsJN+o/gLPqfwz2a51G3TTh7xAOclNwRGvZLnyzLNyKsO8H ru1GJkVP3sNDF/cOR7dVsDziDGbEh543JLGTvE83REx2UlNk6KauMvN301eLz1dWPM1q cmfMC4zjcZF3++h1zuMVWPL/stbMQ3jEOcpzXwEN8+p89tUSAvzW8VWVR4/zj961P6kR Xo0laXjz87NjE7q11ZqizTpahLgFDSwaWbyGGbk1Thl/yTrsnNygZoX5WxIyltVAtnKv y5+ich2tSpWcJqWi74m9sEy1yko5Dt+sNUmxdNsRGjqtnBXOmAnpviN9tDlyE6S64wAP WAVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eUgIGypOvlxmVLkE+IKIHLkcbtFMyPVsMQpyrCGpfZw=; b=EyYjtFGbhe5S6WA14mJgMP9TxRswwjDILPCiPBzpFsm1qHW39YvqLVqjTWzmcqtlI9 dY6yaNKiaK4zVofP7AufSRzStg8epqoUyxuX+U0apDFr3+M3Wicik0W8SU0dvbItIjhr X2BbbR2F4uumWT+mrsML1Cz8Bken/FGh8vTwS95EC5ORYi59ekdXaJkbsRAwUuYuK74H 3cA98ryb163/1kMKyPNqfb5CKZ+lDLECzcprWBcG5ey3E75d5Xsjaxsj/9vlck44Pbru O/7W/1boAFUsZMLAlTHaSzhlFN1OMYqCqsnnqjTlK1PO/XzpPY59GxN5/PCc3+MFWDjV 4A/g== X-Gm-Message-State: AOAM533Y84OvF4scTpxF41AP1bbEmzP3XG/EcXvrWsgFlXeRAWpMj2hw k+YdHk22XYPmlHJSpTIhB5/ZOMal2Jw= X-Google-Smtp-Source: ABdhPJxo+cCHS3ioU5D4z12sa+TajbOrouRynnork6E5HT2ZelrQQRXOGIwpHdDsYfgGnphaFcCOqw== X-Received: by 2002:a05:6402:4413:: with SMTP id y19mr11482931eda.26.1639923612048; Sun, 19 Dec 2021 06:20:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/16] tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521 Date: Sun, 19 Dec 2021 15:20:07 +0100 Message-Id: <20211219142008.248807-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Darren Kenny Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639924403703100001 From: Philippe Mathieu-Daud=C3=A9 Without the previous commit, this test triggers: $ make check-qtest-x86_64 [...] Running test qtest-x86_64/fuzz-megasas-test qemu-system-x86_64: softmmu/physmem.c:3229: address_space_unmap: Assertio= n `mr !=3D NULL' failed. Broken pipe ERROR qtest-x86_64/fuzz-megasas-test - too few tests run (expected 2, got= 1) Suggested-by: Alexander Bulekov Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Darren Kenny Message-Id: <20211119201141.532377-3-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- tests/qtest/fuzz-megasas-test.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/qtest/fuzz-megasas-test.c b/tests/qtest/fuzz-megasas-tes= t.c index 940a76bf25..e1141c58a4 100644 --- a/tests/qtest/fuzz-megasas-test.c +++ b/tests/qtest/fuzz-megasas-test.c @@ -34,6 +34,34 @@ static void test_lp1878263_megasas_zero_iov_cnt(void) qtest_quit(s); } =20 +/* + * Overflow SGL buffer. + * https://gitlab.com/qemu-project/qemu/-/issues/521 + */ +static void test_gitlab_issue521_megasas_sgl_ovf(void) +{ + QTestState *s =3D qtest_init("-display none -m 32M -machine q35 " + "-nodefaults -device megasas " + "-device scsi-cd,drive=3Dnull0 " + "-blockdev " + "driver=3Dnull-co,read-zeroes=3Don,node-nam= e=3Dnull0"); + qtest_outl(s, 0xcf8, 0x80000818); + qtest_outl(s, 0xcfc, 0xc000); + qtest_outl(s, 0xcf8, 0x80000804); + qtest_outw(s, 0xcfc, 0x05); + qtest_bufwrite(s, 0x0, "\x01", 0x1); + qtest_bufwrite(s, 0x7, "\x01", 0x1); + qtest_bufwrite(s, 0x10, "\x02", 0x1); + qtest_bufwrite(s, 0x16, "\x01", 0x1); + qtest_bufwrite(s, 0x28, "\x01", 0x1); + qtest_bufwrite(s, 0x33, "\x01", 0x1); + qtest_outb(s, 0xc040, 0x0); + qtest_outb(s, 0xc040, 0x20); + qtest_outl(s, 0xc040, 0x20000000); + qtest_outb(s, 0xc040, 0x20); + qtest_quit(s); +} + int main(int argc, char **argv) { const char *arch =3D qtest_get_arch(); @@ -43,6 +71,8 @@ int main(int argc, char **argv) if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { qtest_add_func("fuzz/test_lp1878263_megasas_zero_iov_cnt", test_lp1878263_megasas_zero_iov_cnt); + qtest_add_func("fuzz/gitlab_issue521_megasas_sgl_ovf", + test_gitlab_issue521_megasas_sgl_ovf); } =20 return g_test_run(); --=20 2.33.1 From nobody Mon Feb 9 15:29:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639924266985592.4315455254881; Sun, 19 Dec 2021 06:31:06 -0800 (PST) Received: from localhost ([::1]:43378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myxDN-0004t8-Qj for importer@patchew.org; Sun, 19 Dec 2021 09:31:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx2t-0003io-Nc for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:17 -0500 Received: from [2a00:1450:4864:20::529] (port=42712 helo=mail-ed1-x529.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx2s-0006N5-3I for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:20:15 -0500 Received: by mail-ed1-x529.google.com with SMTP id j21so23421240edt.9 for ; Sun, 19 Dec 2021 06:20:13 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y19sm5791584edc.17.2021.12.19.06.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NppSTb94GidqFoYp7M1h4NK2cjGP1OYoE31FoV7I3R0=; b=RlD6iZhg0qGuRCMNjH4Uma6gsw7WGYrd9+63ZZnc9amYGO1xcUWyU9gbUn1sMrdLsy P1xGQmweymnEkJXRff9OIa03oEvoO8Ooc7UyHAgdbfwtQnptlVtuiCHxwI0skSlIrs5N MuYeY5vsk6sAjg22AiJzoVLO+1FXbgMR9cu3JTLs8P47fneaUV80LZQKoN6SlIYhKMx4 F/L9ERwYbIzTuxCm0seTMYYLK9md3/ibyZ0CZ+pRB3V3qGFlsFPM58dh8oV4pEI9QoWs wSJ236sYYuR7OrLnmSyzIr99xpOXKCTViiD8Ht6L64S8EGADeboPw/jy16fxV9FfZiTy gUYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NppSTb94GidqFoYp7M1h4NK2cjGP1OYoE31FoV7I3R0=; b=uHLsP4ppzPRFGDC/twmwo0tdDLkpx/PzCe2gwqhezR/mqRqa6Yu1NU8gUPlDy96wk2 p+MIPrrEOCdK4lQf3V6Xqx6EteJIOLl9XiNL9abNCOlhs4iO/vguVglCbjW2w7U6MTZS MLVb3xXEWgtm5VXeVKW3JMoY+/vmAi/YGmhU6XOTRGWaKKBixYNWDsqXU6rNjO/1cd8S WSgzFNWeyP3wpF3hkFIejVY4h/WdKISsTnoKD+FDzzWvEwsLbz9AYsOp3/+Liw+P3yob gi/Jan0HOhjleA2xBMSuruOKtwX7B954Ho/pHXKyrFsIZ2mI3zjJmf4+0rrydbbox3nx q+Nw== X-Gm-Message-State: AOAM530x1Oi1P/kwotvkp+2lTgCHA3E89JX+DScTZYKJXubjkRXPje+p siK30L1lQu6XysUCuPQR/+lFNH55BIM= X-Google-Smtp-Source: ABdhPJzipBAqpCxmXjB7AGGnGgQ8j19QPY+w78bwgxWSPsnbgvXBjM6g3qw8H9wfZmCQtZ33IvZoRw== X-Received: by 2002:a17:906:6a90:: with SMTP id p16mr9416148ejr.342.1639923612862; Sun, 19 Dec 2021 06:20:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/16] hw/i386/vmmouse: Require 'i8042' property to be set Date: Sun, 19 Dec 2021 15:20:08 +0100 Message-Id: <20211219142008.248807-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::529 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Calvin Buckley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639924267494100001 From: Philippe Mathieu-Daud=C3=A9 If the 'i8042' property is not set, mouse events handled by vmmouse_mouse_event() end calling i8042_isa_mouse_fake_event() with a NULL argument, resulting in ps2_mouse_fake_event() being called with invalid PS2MouseState pointer. Fix by requiring the 'i8042' property to be always set: $ qemu-system-x86_64 -device vmmouse qemu-system-x86_64: -device vmmouse: 'i8042' link is not set Fixes: 91c9e09147b ("vmmouse: convert to qdev") Reported-by: Calvin Buckley Resolves: https://gitlab.com/qemu-project/qemu/-/issues/752 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211201223253.36080-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/i386/vmmouse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 3d66368286..a56c185f15 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -286,6 +286,10 @@ static void vmmouse_realizefn(DeviceState *dev, Error = **errp) =20 DPRINTF("vmmouse_init\n"); =20 + if (!s->i8042) { + error_setg(errp, "'i8042' link is not set"); + return; + } if (!object_resolve_path_type("", TYPE_VMPORT, NULL)) { error_setg(errp, "vmmouse needs a machine with vmport"); return; --=20 2.33.1