From nobody Thu Nov 20 12:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763412007; cv=none; d=zohomail.com; s=zohoarc; b=UzvvJbgsOZnnLrjmfrjH3JOveYXyC0uUGZnZ/T7+4I0eY0LG651gEXOTPaVFGweB28+sX3S/OFZxnAdS2P63o35k+/Sy/jUdjUW85uQ6xlBSv5MjeqaxiYDlgV6XWd0+ykkZSvN08MZK0KbUvLpyPtlAjOKytVif/a5Q7KLtCjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763412007; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+dQxn+7K1DnLqxzX8+uoAG3/GgxJkaJRF7+GxCfNDfM=; b=JVKlz14cRR+bh74nAvZzuAciyfOt64AOyOOJuXqbMQkqi2abtW4AIMbwIcuKeFUt/qH9xCg8dGdXQ690WzGga6oJhv+WjPxZ2JDcYdzO3vZyB60OlhQjD0gpoOyFpSgybdz9WANuxF+FhP9qIVbgBL9KipY6KVc0Yn76ZUf83ZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763412007471996.9656631516481; Mon, 17 Nov 2025 12:40:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL608-0005Ki-Di; Mon, 17 Nov 2025 15:39:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vL5zt-0005JR-AR for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:38:50 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vL5zr-0000bp-9p for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:38:48 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-47790b080e4so17805025e9.3 for ; Mon, 17 Nov 2025 12:38:45 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47787e442c2sm335227675e9.7.2025.11.17.12.38.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Nov 2025 12:38:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763411924; x=1764016724; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+dQxn+7K1DnLqxzX8+uoAG3/GgxJkaJRF7+GxCfNDfM=; b=ykZbnHG4WasXQc+fS4neQXliGUX4GvxOPxyEnfoAtsTj6sQOxrunZulytBgbRhvLXi OI1PxjgA5j/QfUS5RnrR0UhbKMnk7T47zklAa1gVsI9dSkuAOOlgHG5fBpbjVpnsEAPn jL+VzR6zJMExJJFS7mX5mzAtg/6MxYCu+8kfXrtbhXK/VySuIjSIr0VWy+fOr0RE+nrf QD14tjUCCun14/KI829UypgGp+8KJPUOhKAKkWLtY5rsFKT8pgWD2+yqoz3HlcaS6uzg ghau0UTKWfbxz8+U0czjWnUIBQtP2oQ3HrOj9Q6WF9uSY5OOAlVDkveQxWEBrewqgZoo eySw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763411924; x=1764016724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+dQxn+7K1DnLqxzX8+uoAG3/GgxJkaJRF7+GxCfNDfM=; b=sFf8vIGkNmCzoJZA2FxIEf/Bif3YTs8e94b7fRraaeddRJpSbMfZYBps0Jbw1BvblT 0ChrgGmRF95rZ638Flsd8CwOypPnw19h69BPSaV6LdQqiXzbYHunPwPSJBd4xFLRqDzh 4vH/pOaPF730miBe3KwE71UKvOfjFBqeLDA5RZtBCd/LqcMwh9eEKyOIwGWwlkh+ktnF FFWJY3s8PrCKqE27sptX2Ye7ZtxUBMxWdEMovtBvUw+7mNIrLPt5WRrRhq0yP6KsE60j BlnXWdpVzZ2Yv7B+Wax6mRrPqM6M26d8y3R5NNB0uorBDgBZxOxEeNvOonc/LFLCuCkl nhbw== X-Gm-Message-State: AOJu0YyqDfdLGkVdADGqbPi1G6HWKjES9UXA1Ze9daszRVb0pkxPDIPk NnkixF8aLj3mf7eJdX2R5QeGAg96IKl0LmQruPQvSJGaqOvRcrSCnTxv4S7zt5IGV4vbqd60Utm /PYZ3pbAwwQ== X-Gm-Gg: ASbGncu9kvmG37WedfFkBUj7n4ia5PjVuPUEhY2WhwCahRo4BO+0srVeRUz7pJpJ4cd m0Fsv9LpZoa+TsDQP7UQyWS7AoQkbmJGvpLuqu8vXkz07cr8/WePB591jArEsw0iLgOhaL2fzGx fMPtSnbknC626zOFbdVfgtliKkrbepHXq6pawqTLvA9ubJM2DXxGGDtU7jAe2UXH8ymTzNisiGV BBfAsYHq2b4+7XY3SS/qizmCbcLudM54FK5zGU5hU92UvEMbvMgxk9GbrV6uX1uHNOYWe/RCvqM v8ZwmlB3Fn54SuHjIdS6+HH4jaWpZVq+GLwWnEnGkx5fSxGs0V7SsLKPRkVMz+7xz0yeIOrpMMi JDcJYlvR1bTNkCIBN9WnvrIJDvEbPI07/HcittFnAiEoXfM/lx0sg14fAIIkt0Xxl1c/CAuOsFW QXCZ3auX0YdiGsOZtrMSgo2P2DwVmdrk76pLFIn/VSdU3PxeeFfvNoemaGZA6D X-Google-Smtp-Source: AGHT+IGLme3x2Ng/f07RZoW67xnz84j5DP/TeuewLy0le9/Bq16JZ7Pe7g29mJr5Lt2Mt2h0b+4vqA== X-Received: by 2002:a05:600c:630d:b0:471:1765:839c with SMTP id 5b1f17b1804b1-4778fea2bf7mr114591505e9.20.1763411924405; Mon, 17 Nov 2025 12:38:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nick Briggs , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Zhijian , Kostiantyn Kostiuk , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Andrew Deason , Eric Blake , Michael Roth , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Mark Cave-Ayland Subject: [PATCH-for-10.2 1/3] qga/commands: Include proper Solaris header for getloadavg() Date: Mon, 17 Nov 2025 21:38:32 +0100 Message-ID: <20251117203834.83713-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251117203834.83713-1-philmd@linaro.org> References: <20251117203834.83713-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763412008068158500 Solaris declares getloadavg() in : getloadavg(3C) Standard C Library Functions getloadavg(3C) NAME getloadavg - get system load averages SYNOPSIS #include int getloadavg(double loadavg[], int nelem); [...] Oracle Solaris 11.4 23 Jul 2020 getloadavg(3C) Include it in order to avoid: ../qga/commands-posix.c: In function 'qmp_guest_get_load': ../qga/commands-posix.c:1408:9: error: implicit declaration of function '= getloadavg' [-Wimplicit-function-declaration] 1408 | if (getloadavg(loadavg, G_N_ELEMENTS(loadavg)) < 0) { | ^~~~~~~~~~ ../qga/commands-posix.c:1408:9: warning: nested extern declaration of 'ge= tloadavg' [-Wnested-externs] ../configure relevant output: C compiler for the host machine: gcc (gcc 14.2.0 "gcc (GCC) 14.2.0") C linker for the host machine: gcc ld.solaris 5.11-1.3315 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Reviewed-by: Kostiantyn Kostiuk --- qga/commands-posix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index c7059857e44..66f3e6f6733 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -43,6 +43,9 @@ #include #endif #ifdef CONFIG_SOLARIS +#ifdef CONFIG_GETLOADAVG +#include +#endif #include #endif #endif --=20 2.51.0 From nobody Thu Nov 20 12:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763411967; cv=none; d=zohomail.com; s=zohoarc; b=DmiYM+2buONxHoEjyMoHNqovVzrfXmBbtP7FKfH50dTlISRssetLlMuILjF1c4aqGCLw7ni4T7rSKmEY9QwjIdpIchhmsDAH8QmoBuEZ4lUZtTA8fiiYqZ/cq8RNVjEFrKG3E5cR5dLYX3GVy4Vvbfj0BhHndHr8/kprLM0L5Is= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763411967; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IwAOx9Hsl9tPV/fbNKmTyyOWz5fj4m6Yt+dsMAsL3yE=; b=nJYhpYeHdpBKUp+C7d2SzS7ftHdYtbWlqpwnERxlxe15idDXvgAuGjj3UXGHV3VOliHf62kWrNeFxRX8NHCra3r7ykFtKKk91LhdvuPVclL8jCBxLRTv88NDkM1s2F3c5axeMgGYalm3dumqPoH7Z2sZrrws51vZOK4mkfRv5iE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763411967904657.9059631617702; Mon, 17 Nov 2025 12:39:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL60B-0005Kv-Ux; Mon, 17 Nov 2025 15:39:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vL5zz-0005Jr-Oz for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:38:56 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vL5zx-0000cZ-PN for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:38:55 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-47755a7652eso32763625e9.0 for ; Mon, 17 Nov 2025 12:38:53 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477a0f4ff42sm90424585e9.12.2025.11.17.12.38.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Nov 2025 12:38:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763411932; x=1764016732; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IwAOx9Hsl9tPV/fbNKmTyyOWz5fj4m6Yt+dsMAsL3yE=; b=WiZbv2fA/4PM7t0bv5ewJXUmSs2S3TXGbpWB0/o6aVzO2Sv2TrHQaiZgLX7YxepP3k XIEbjPmoeXRWmcAWQxBScjB25qTgN2W+jYa8otYZYqQYlMoe70Q1K1sUi1YdoHIv5cWF nIlnYDlnoYXWUq6ys4x/GZODTw1ElRWZitAWaCJ+OXkbrm09K9c8L5cdBDhuYG6Z/CeM KXo834HiVEKBsHJfTOdSr6luNb/Gxg5ckAhn7DD8gHbzi74bCMXdcE49vh0IT2cv1ljD fYXgs1YuaDweritKxqsrERy+Gjb7tY0gMzsfT+kZu531nPwYCmzPo4OY58eZLJEBsQcH lshQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763411932; x=1764016732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IwAOx9Hsl9tPV/fbNKmTyyOWz5fj4m6Yt+dsMAsL3yE=; b=i24Y2YgzcwhWpWUSssmeeDgOPObXhptbmsNKwQs2X+mpFqOwTdjGYwpW7dQfoaJLj0 eXZD8E+OjrT0AzX/4CQhQ14gSrEmrb3yqAKtrYgnm2TmGNKThnP05Dj5jVkZjugI54+f mg78nfsLbmXn0qVKdaEYGOM4OhLPGxki0D69Qh4ikXpDxBrWXah8eaAQPH1NZC/fzQEY Cg4sK5Tu2Qbh0So3EpqzPageziEvKrfcthydiUavuJiEBpqwuPUPsL3autW/KIiWSMqv MlTYzXzN4qd+9JcCQLUwRhZjBWGtSBR3kfzS7ObEvJEe5dupNbI38jzFDJghhs81eD9S Rsjg== X-Gm-Message-State: AOJu0YzPbAhsIbrN2EvCfKX1aaSvm4TUWk77Wdyb6OpRBl/MYgDY+hNz i70wOKf4g/SkyXs5GXNVQOFykg5N7m/+DB0hFNrGQ3dh8XX4/4AVWfOq2E1ADj/3/zvIr0pB41n l0/TuwMRQYg== X-Gm-Gg: ASbGncujUTLZYD/xt4+lGCPYioizT/ODPhFVF/BuQcLRaooBNnYLAO/HqmbV1UEmkzr 1P5oE9lQCGFy66YIsf9bx9BYg2McK6IRedl2b3/BEptAku1Bj3EceIr4a2b+ZqRkTTa9kK5nXK2 CvWVLuIw+SwqrW5lq1xmZ6jEXccEQyqsgLRnge6HLu8Zw6CUi8CVYq+BJfxBr5SbEJvWUmN/Ps7 +9xy9FZiNkF8Bv44uZZiEKhrQj1vcxFdSjnv6PhK+qCT7HA4VgC7YvGJdI8h+9MAqURkHp1bQZv 4XNIfvEwz4d0HfEBb72ENSUVcGPtvwhV3FCR2hvu1kO2RWtIaVnQ1oxQF8DSJ8f40EihJIZJk8S 5JyVSiuoBzsytAyBmDfaN7qjy4MpZb6bFCjvJ7rSfkNnClFnkEXv3eFL+eUaLuy0BCC+I6zmEjv GaZN7uGgNnWhmANT9jLrJRDkDn5i3cj6YEz5rdCmQsW9wRjOPFICNWPyFJsQtv/kVzyidZCHo= X-Google-Smtp-Source: AGHT+IFz3b9knL/n8h8K6LzdtzVWHarlefA9XTMY6gkk6Uew5Q4u/PObyg7yUaGYeDv4G6ug0rBG0w== X-Received: by 2002:a05:600c:6052:b0:477:9986:5e6b with SMTP id 5b1f17b1804b1-47799866420mr56228585e9.28.1763411931622; Mon, 17 Nov 2025 12:38:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nick Briggs , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Zhijian , Kostiantyn Kostiuk , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Andrew Deason , Eric Blake , Michael Roth , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Mark Cave-Ayland Subject: [PATCH-for-10.2 2/3] migration/rdma: Check ntohll() availability with meson Date: Mon, 17 Nov 2025 21:38:33 +0100 Message-ID: <20251117203834.83713-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251117203834.83713-1-philmd@linaro.org> References: <20251117203834.83713-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763411970812153000 Commit 44ce1b5d2fc ("migration/rdma: define htonll/ntohll only if not predefined") tried to only include htonll/ntohll replacements when their symbol is *defined*, but this doesn't work, as they aren't: ../migration/rdma.c:242:17: error: static declaration of 'htonll' follows= non-static declaration 242 | static uint64_t htonll(uint64_t v) | ^~~~~~ In file included from /usr/include/netinet/in.h:73, from /usr/include/sys/socket.h:32, from /home/f4bug/qemu/include/system/os-posix.h:30, from /home/f4bug/qemu/include/qemu/osdep.h:176, from ../migration/rdma.c:17: /usr/include/sys/byteorder.h:75:18: note: previous declaration of 'htonll= ' with type 'uint64_t(uint64_t)' {aka 'long unsigned int(long unsigned int)= '} 75 | extern uint64_t htonll(uint64_t); | ^~~~~~ ../migration/rdma.c:252:17: error: static declaration of 'ntohll' follows= non-static declaration 252 | static uint64_t ntohll(uint64_t v) | ^~~~~~ /usr/include/sys/byteorder.h:76:18: note: previous declaration of 'ntohll= ' with type 'uint64_t(uint64_t)' {aka 'long unsigned int(long unsigned int)= '} 76 | extern uint64_t ntohll(uint64_t); | ^~~~~~ Better to check the symbol availability with meson. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Xu Reviewed-by: Richard Henderson --- meson.build | 1 + migration/rdma.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index df4460035c3..72edd6097a4 100644 --- a/meson.build +++ b/meson.build @@ -2663,6 +2663,7 @@ config_host_data.set('CONFIG_SYNCFS', cc.has_function= ('syncfs')) config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_= range')) config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create')) config_host_data.set('CONFIG_GETLOADAVG', cc.has_function('getloadavg')) +config_host_data.set('CONFIG_ARPA_INET_64', cc.has_function('htonll')) config_host_data.set('HAVE_COPY_FILE_RANGE', cc.has_function('copy_file_ra= nge')) config_host_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs')) config_host_data.set('HAVE_GLIB_WITH_SLICE_ALLOCATOR', glib_has_gslice) diff --git a/migration/rdma.c b/migration/rdma.c index 2d839fce6c4..337b4158899 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -238,7 +238,7 @@ static const char *control_desc(unsigned int rdma_contr= ol) return strs[rdma_control]; } =20 -#if !defined(htonll) +#if !defined(CONFIG_ARPA_INET_64) static uint64_t htonll(uint64_t v) { union { uint32_t lv[2]; uint64_t llv; } u; @@ -246,9 +246,7 @@ static uint64_t htonll(uint64_t v) u.lv[1] =3D htonl(v & 0xFFFFFFFFULL); return u.llv; } -#endif =20 -#if !defined(ntohll) static uint64_t ntohll(uint64_t v) { union { uint32_t lv[2]; uint64_t llv; } u; --=20 2.51.0 From nobody Thu Nov 20 12:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1763412010; cv=none; d=zohomail.com; s=zohoarc; b=DsChHx1bacWSdvau1IK9frmUx715sur5vVRj19SR4/seFBldYtpwCmL6TTufEVpUbTJure5lmQAGzOIeo2UNQMdmM7z1oZQHT/Eu9u8Bt2To2N/bIClPku2Dq0h7YflIIhBUGeoUHXJOZFPBO9xOaelAHZHn6PXSth2FCdmRqN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763412010; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fFyGRInXFBpZaeNlXle17cFajkY7UYBMTQRyOKOfKmE=; b=XH7JeHEniNgx6sh5fCbRmX+P2rr0iiUKTRgLK2EhcEt2v0TsaSmQUGWtGoH5pti1qdeIQ5rQeR5ZVFmVtHDWEZjAC+ygcKpKMDgFFqd/vZpVTLJu7JtKKN0MycEQWbvvguiEzPrsxK2hUxOO667f4DickPBH3oj8dnR25nANJx0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763412010729713.5807398704428; Mon, 17 Nov 2025 12:40:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL60P-0005Mh-Ht; Mon, 17 Nov 2025 15:39:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vL60C-0005L2-ER for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:39:10 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vL605-0000dK-Q1 for qemu-devel@nongnu.org; Mon, 17 Nov 2025 15:39:03 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-42b3d4d9ca6so3908310f8f.2 for ; Mon, 17 Nov 2025 12:39:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53e7aea7sm27901909f8f.1.2025.11.17.12.38.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Nov 2025 12:38:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763411940; x=1764016740; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fFyGRInXFBpZaeNlXle17cFajkY7UYBMTQRyOKOfKmE=; b=M/lm+vTui9Md5gLzuBt9S5BkvjAvtRpAYT9WArM6VrsrJJ5G7KMMTXLRyTluceECMa rPr9s2cjX5K41zJklBOA0KsSAHhXXi2wkG2xt0D6LbgtjrRB/HnKBLtD3ZteG4DWdttj 9VKXP/csZtONS4GFRkMlFk0ZageOeIL7GT+Y06t2F6FtZWsj62BDBW4SRHlHrRn3PD5d xZOZUYvDqD7zKO50ZHZ3rhalNiJMr7r/t9VPeIo2iO21ZApiwGjlnrCpC6Ka6K1fNF3a p1q3TVscDpxTxgnlQnPJHF3rPIJgnIuJ5j9YBeoZNphcy7896u3Fbr9/aFLAQnzDqYbv InSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763411940; x=1764016740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fFyGRInXFBpZaeNlXle17cFajkY7UYBMTQRyOKOfKmE=; b=nESMOHG+0+n888fY6/mgzDCPfZ0kUBrZirrfHdAMA5UAsIcwlDJ10rK6FMcR4ROfBh 0QWbayBa0B8e4ZbdOg4TS/E+YfN0yr2Vw0Fw9lKk7lJc4uXEJaCmX4bVUvHg3eb7EPCx xOW1wfwtD4AI6mbsAUh+lmOsjP8RJCkOc3hpgGE82d8I2pmOk6jBF+MkD7PMNxlbHafb vlyOlYJ2fJiOGxelopxWgEaZoq8aeAymIBC0LfgdhpSTOP/CTAulo3Euxs8Im+MChOFe YpxmmYYImg+/ySk0goZ29Ex3ckzF6Zn3FWZbJHzhPhgBJ3yi9df1fAblnFtAxk9l/n4N 2fpw== X-Gm-Message-State: AOJu0YzQUpQOYp6j7oh+xBzbgKSNww6vI2USVwAEg2DY35AEHY5OQrhk MKA1QOBcDM9/Arg4hLGjvApRfssWd1pwNKB+efZSRT9af1AvUwh1gXyZ50t9hE8/E757J3kCiR/ C16l1KQT/Eg== X-Gm-Gg: ASbGncsPYtppY1Hgo4LfWzYOdeoNSrXBE4u341pqnfGxXYqOPvcZ7KMIWU9mvNL4qzn ebYWzTiMWHPT2uiSvBnrF3Y69oZIC4Jh/avWKc/ote+uGZdwAH3gCRuK42uIKjNhplAwUbVCgpN oa0GdGTs6OISUfVR0xhbYr/68jlqdka6FNGcna6rOq2s/8q7SdC3ekWRC2G8Pc9PKFWqvjdJs5m 0U+zGmc0eVNMCkV1zv6NOh1Q28zCgndUi2m9mQnyzKnx4rfm2k24iqA4i9OIk+lC01TKFvLvYGB w6wr4uaRxGKWlcs6625vgoUyjtW8P4u8d9nEIT0yqX31kYIE4NlGaDTia3YP5n49MQOYXIv8aQ3 I7EOY78JbwqtPfEyML6bxuYa7+iKUX6lhqTld7/9nBVZlCZ7Ku5daqXeVTkaqfW+0lQD0QHSwNm 884MP8TF6UGYBDjVdc4GxEXl1wuFLvdwyOknp91kIDqvu6wlxkRA== X-Google-Smtp-Source: AGHT+IGasQkJTIBq9jHENy2gaGASJz+hCICNjeUX2rdp3uffCo4bb9CVdyOvFS1MDnPcfyT/7T1KGA== X-Received: by 2002:a5d:584b:0:b0:405:3028:1be2 with SMTP id ffacd0b85a97d-42b59328ec3mr14512400f8f.11.1763411938834; Mon, 17 Nov 2025 12:38:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nick Briggs , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Zhijian , Kostiantyn Kostiuk , Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Andrew Deason , Eric Blake , Michael Roth , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Mark Cave-Ayland Subject: [PATCH-for-10.2 3/3] target/arm/tcg: Undefine Solaris FSCALE definition as a kludge Date: Mon, 17 Nov 2025 21:38:34 +0100 Message-ID: <20251117203834.83713-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251117203834.83713-1-philmd@linaro.org> References: <20251117203834.83713-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1763412012133158500 CONFIG_SOLARIS_FSCALE Solaris defines FSCALE in : 301 /* 302 * Scale factor for scaled integers used to count 303 * %cpu time and load averages. 304 */ 305 #define FSHIFT 8 /* bits to right of fixed binary poin= t */ 306 #define FSCALE (1<esz], a) | ^~~~~~~~~~ ../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro 'DO= _ZPZZ_FP' 4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) | ^~~~~~~~~~ ../target/arm/tcg/translate-sve.c:4249:12: error: expected declaration sp= ecifiers or '...' before numeric constant 4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) | ^~~~~~ ../target/arm/tcg/translate.h:875:25: note: in definition of macro 'TRANS= _FEAT' 875 | static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \ | ^~~~ ../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro 'DO= _ZPZZ_FP' 4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) | ^~~~~~~~~~ ../target/arm/tcg/translate.h:875:47: error: pasting "arg_" and "(" does = not give a valid preprocessing token 875 | static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \ | ^~~~ ../target/arm/tcg/translate-sve.c:4205:5: note: in expansion of macro 'TR= ANS_FEAT' 4205 | TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz, name##_zpzz_fn= s[a->esz], a) | ^~~~~~~~~~ ../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro 'DO= _ZPZZ_FP' 4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) | ^~~~~~~~~~ In file included from ../target/arm/tcg/translate-sve.c:100: libqemu-aarch64-softmmu.a.p/decode-sve.c.inc:1227:13: warning: 'trans_FSC= ALE' used but never defined 1227 | static bool trans_FSCALE(DisasContext *ctx, arg_FSCALE *a); | ^~~~~~~~~~~~ ../target/arm/tcg/translate-sve.c:4249:30: warning: 'sve_fscalbn_zpzz_fns= ' defined but not used [-Wunused-const-variable=3D] 4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) | ^~~~~~~~~~~ ../target/arm/tcg/translate-sve.c:4201:42: note: in definition of macro '= DO_ZPZZ_FP' 4201 | static gen_helper_gvec_4_ptr * const name##_zpzz_fns[4] =3D {= \ | ^~~~ As a kludge, check the definition existence with meson, then undefine it locally in target/arm/tcg/translate-sve.c file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 3 +++ target/arm/tcg/translate-sve.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meson.build b/meson.build index 72edd6097a4..65dd2bc6873 100644 --- a/meson.build +++ b/meson.build @@ -2779,6 +2779,9 @@ config_host_data.set('HAVE_TCP_KEEPINTVL', #endif int main(void) { return 0; }''', name: 'Win32 TCP_KEEPINTVL')) +if host_os =3D=3D 'sunos' + config_host_data.set('CONFIG_SOLARIS_FSCALE', cc.has_header_symbol('sys/= param.h', 'FSCALE')) +endif =20 # has_member config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 07b827fa8e8..b6fd069aa0c 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4246,6 +4246,9 @@ DO_ZPZZ_AH_FP_B16(FMAX_zpzz, aa64_sve, sve_fmax, sve_= ah_fmax) DO_ZPZZ_FP_B16(FMINNM_zpzz, aa64_sve, sve_fminnum) DO_ZPZZ_FP_B16(FMAXNM_zpzz, aa64_sve, sve_fmaxnum) DO_ZPZZ_AH_FP(FABD, aa64_sve, sve_fabd, sve_ah_fabd) +#ifdef CONFIG_SOLARIS_FSCALE +#undef FSCALE /* Kludge for Solaris which defines FSCALE in = */ +#endif DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) DO_ZPZZ_FP(FDIV, aa64_sve, sve_fdiv) DO_ZPZZ_FP(FMULX, aa64_sve, sve_fmulx) --=20 2.51.0