From nobody Mon Feb 9 19:55:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164731092341566.03997516805009; Mon, 14 Mar 2022 19:22:03 -0700 (PDT) Received: from localhost ([::1]:48042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTwp0-0006Px-7c for importer@patchew.org; Mon, 14 Mar 2022 22:22:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnl-0004xP-Ac for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:45 -0400 Received: from smtp123.iad3a.emailsrvr.com ([173.203.187.123]:58663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnj-0002gV-Gu for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:45 -0400 Received: by smtp24.relay.iad3a.emailsrvr.com (Authenticated sender: adeason-AT-sinenomine.net) with ESMTPSA id E3EDB21FC4; Mon, 14 Mar 2022 22:20:41 -0400 (EDT) X-Auth-ID: adeason@sinenomine.net From: Andrew Deason To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] util/osdep: Avoid madvise proto on modern Solaris Date: Mon, 14 Mar 2022 21:20:23 -0500 Message-Id: <20220315022025.18908-2-adeason@sinenomine.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220315022025.18908-1-adeason@sinenomine.net> References: <20220315022025.18908-1-adeason@sinenomine.net> X-Classification-ID: dfe4ae03-7d50-4331-ad7e-e8686e56eaca-2-1 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=173.203.187.123; envelope-from=adeason@sinenomine.net; helo=smtp123.iad3a.emailsrvr.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , Andrew Deason , Richard Henderson , Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1647310925389100004 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" On older Solaris releases, we didn't get a protype for madvise, and so util/osdep.c provides its own prototype. Some time between the public Solaris 11.4 release and Solaris 11.4.42 CBE, we started getting an madvise prototype that looks like this: extern int madvise(void *, size_t, int); which conflicts with the prototype in util/osdeps.c. Instead of always declaring this prototype, check if we're missing the madvise() prototype, and only declare it ourselves if the prototype is missing. The 'missing_madvise_proto' meson check contains an obviously wrong prototype for madvise. So if that code compiles and links, we must be missing the actual prototype for madvise. Signed-off-by: Andrew Deason --- To be clear, I'm okay with removing the prototype workaround unconditionally; I'm just not sure if there's enough consensus on doing that. The "missing prototype" check is based on getting a compiler error on a conflicting prototype, since this just seems more precise and certain than getting an error from a missing prototype (needs -Werror=3Dmissing-prototypes or -Werror). But I can do it the other way around if needed. Changes since v1: - madvise prototype check changed to not be platforms-specific, and turned = into CONFIG_MADVISE_MISSING_PROTOTYPE.=20 meson.build | 17 +++++++++++++++-- util/osdep.c | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 2d6601467f..ff5fce693e 100644 --- a/meson.build +++ b/meson.build @@ -1705,25 +1705,38 @@ config_host_data.set('CONFIG_EVENTFD', cc.links(''' int main(void) { return eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); }''')) config_host_data.set('CONFIG_FDATASYNC', cc.links(gnu_source_prefix + ''' #include int main(void) { #if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0 return fdatasync(0); #else #error Not supported #endif }''')) -config_host_data.set('CONFIG_MADVISE', cc.links(gnu_source_prefix + ''' + +has_madvise =3D cc.links(gnu_source_prefix + ''' #include #include #include - int main(void) { return madvise(NULL, 0, MADV_DONTNEED); }''')) + int main(void) { return madvise(NULL, 0, MADV_DONTNEED); }''') +missing_madvise_proto =3D false +if has_madvise + missing_madvise_proto =3D cc.links(gnu_source_prefix + ''' + #include + #include + #include + extern int madvise(int); + int main(void) { return madvise(0); }''') +endif +config_host_data.set('CONFIG_MADVISE', has_madvise) +config_host_data.set('CONFIG_MADVISE_MISSING_PROTOTYPE', missing_madvise_p= roto) + config_host_data.set('CONFIG_MEMFD', cc.links(gnu_source_prefix + ''' #include int main(void) { return memfd_create("foo", MFD_ALLOW_SEALING); }''')) config_host_data.set('CONFIG_OPEN_BY_HANDLE', cc.links(gnu_source_prefix += ''' #include #if !defined(AT_EMPTY_PATH) # error missing definition #else int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh,= 0); } #endif''')) diff --git a/util/osdep.c b/util/osdep.c index 7c4deda6fe..560ce9111a 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -21,20 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ #include "qemu/osdep.h" #include "qapi/error.h" =20 /* Needed early for CONFIG_BSD etc. */ =20 #ifdef CONFIG_SOLARIS #include +#endif + +#ifdef HAVE_MADVISE_MISSING_PROTOTYPE /* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=3D7156) for discussion about Solaris header problems */ extern int madvise(char *, size_t, int); #endif =20 #include "qemu-common.h" #include "qemu/cutils.h" #include "qemu/sockets.h" #include "qemu/error-report.h" #include "qemu/madvise.h" --=20 2.11.0 From nobody Mon Feb 9 19:55:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647311954036884.6951314747354; Mon, 14 Mar 2022 19:39:14 -0700 (PDT) Received: from localhost ([::1]:59762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTx5e-0006yo-48 for importer@patchew.org; Mon, 14 Mar 2022 22:39:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnl-0004xX-TL for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:45 -0400 Received: from smtp121.iad3a.emailsrvr.com ([173.203.187.121]:37684) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnk-0002gZ-2T for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:45 -0400 Received: by smtp24.relay.iad3a.emailsrvr.com (Authenticated sender: adeason-AT-sinenomine.net) with ESMTPSA id E08EE23259; Mon, 14 Mar 2022 22:20:42 -0400 (EDT) X-Auth-ID: adeason@sinenomine.net From: Andrew Deason To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] hw/i386/acpi-build: Avoid 'sun' identifier Date: Mon, 14 Mar 2022 21:20:24 -0500 Message-Id: <20220315022025.18908-3-adeason@sinenomine.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220315022025.18908-1-adeason@sinenomine.net> References: <20220315022025.18908-1-adeason@sinenomine.net> X-Classification-ID: dfe4ae03-7d50-4331-ad7e-e8686e56eaca-3-1 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=173.203.187.121; envelope-from=adeason@sinenomine.net; helo=smtp121.iad3a.emailsrvr.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , Andrew Deason , Richard Henderson , Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1647311978592100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" On Solaris, 'sun' is #define'd to 1, which causes errors if a variable is named 'sun'. Slightly change the name of the var for the Slot User Number so we can build on Solaris. Signed-off-by: Andrew Deason Reviewed-by: Ani Sinha --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4ad4d7286c..dcf6ece3d0 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -576,32 +576,32 @@ static void build_append_pci_bus_devices(Aml *parent_= scope, PCIBus *bus, } =20 Aml *aml_pci_device_dsm(void) { Aml *method, *UUID, *ifctx, *ifctx1, *ifctx2, *ifctx3, *elsectx; Aml *acpi_index =3D aml_local(0); Aml *zero =3D aml_int(0); Aml *bnum =3D aml_arg(4); Aml *func =3D aml_arg(2); Aml *rev =3D aml_arg(1); - Aml *sun =3D aml_arg(5); + Aml *sunum =3D aml_arg(5); =20 method =3D aml_method("PDSM", 6, AML_SERIALIZED); =20 /* * PCI Firmware Specification 3.1 * 4.6. _DSM Definitions for PCI */ UUID =3D aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D"); ifctx =3D aml_if(aml_equal(aml_arg(0), UUID)); { - aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sun), acpi_ind= ex)); + aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sunum), acpi_i= ndex)); ifctx1 =3D aml_if(aml_equal(func, zero)); { uint8_t byte_list[1]; =20 ifctx2 =3D aml_if(aml_equal(rev, aml_int(2))); { /* * advertise function 7 if device has acpi-index * acpi_index values: * 0: not present (default value) --=20 2.11.0 From nobody Mon Feb 9 19:55:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647311048901290.778376327577; Mon, 14 Mar 2022 19:24:08 -0700 (PDT) Received: from localhost ([::1]:51532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTwr1-0000PO-Ju for importer@patchew.org; Mon, 14 Mar 2022 22:24:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnm-0004xj-K1 for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:46 -0400 Received: from smtp121.iad3a.emailsrvr.com ([173.203.187.121]:51766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwnk-0002gh-Vl for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:20:46 -0400 Received: by smtp24.relay.iad3a.emailsrvr.com (Authenticated sender: adeason-AT-sinenomine.net) with ESMTPSA id A63C3232DE; Mon, 14 Mar 2022 22:20:43 -0400 (EDT) X-Auth-ID: adeason@sinenomine.net From: Andrew Deason To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] util/osdep: Remove some early cruft Date: Mon, 14 Mar 2022 21:20:25 -0500 Message-Id: <20220315022025.18908-4-adeason@sinenomine.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220315022025.18908-1-adeason@sinenomine.net> References: <20220315022025.18908-1-adeason@sinenomine.net> X-Classification-ID: dfe4ae03-7d50-4331-ad7e-e8686e56eaca-4-1 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=173.203.187.121; envelope-from=adeason@sinenomine.net; helo=smtp121.iad3a.emailsrvr.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , Andrew Deason , Richard Henderson , Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1647311049629100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The include for statvfs.h has not been needed since all statvfs calls were removed in commit 4a1418e07bdc ("Unbreak large mem support by removing kqemu"). The comment mentioning CONFIG_BSD hasn't made sense since an include for config-host.h was removed in commit aafd75841001 ("util: Clean up includes"). Remove this cruft. Signed-off-by: Andrew Deason Reviewed-by: Peter Maydell --- util/osdep.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index 560ce9111a..ed932a0c7c 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -17,26 +17,20 @@ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ #include "qemu/osdep.h" #include "qapi/error.h" =20 -/* Needed early for CONFIG_BSD etc. */ - -#ifdef CONFIG_SOLARIS -#include -#endif - #ifdef HAVE_MADVISE_MISSING_PROTOTYPE /* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=3D7156) for discussion about Solaris header problems */ extern int madvise(char *, size_t, int); #endif =20 #include "qemu-common.h" #include "qemu/cutils.h" #include "qemu/sockets.h" #include "qemu/error-report.h" --=20 2.11.0