From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297850; cv=none; d=zohomail.com; s=zohoarc; b=B3BVn8r6xe/YCvp4pBKZOm+EKx2P9V6It3nOEPvLLhiCubooYul8D7RqotGogjiX94pJ28M4oHOiQKowG8J0xECHHA08ByyNVxPYkCMRER+3143flIq8LxMecdnLUJXNCNaxKw6JSV1iDodo3ep3KOBX2A44RYIkiWTK34exgbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297850; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FG4l56w7PVcMl8GBpWCdbsM/10Bco9m9+W4L22ZsEjQ=; b=IHX8kbii6ixGM7fYvAZDTrrrxabCUmX3+/+zCGJyIEgLBCwF54zT6hhAhFyGMLpPPyUrvRqGeiez28FUSw7LfsC82GH0bCvxWJH0XufV896XoxXO6zgEI+TCTiXAlE23I8vyGho7/vr5odiESzBX4VlgWmmfTH6zZdrNWf0tuuU= 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 1693297850087356.91357896070065; Tue, 29 Aug 2023 01:30:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6g-0002dh-87; Tue, 29 Aug 2023 04:29:50 -0400 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 1qau6c-0002ci-Ts for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6W-0008Q1-FH for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:46 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-306-xlWp7LzLOXKgYQ-pJqG3rw-1; Tue, 29 Aug 2023 04:29:37 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-31c879c41f4so1668577f8f.2 for ; Tue, 29 Aug 2023 01:29:36 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id s8-20020a5d6a88000000b0031431fb40fasm12949098wru.89.2023.08.29.01.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FG4l56w7PVcMl8GBpWCdbsM/10Bco9m9+W4L22ZsEjQ=; b=a0VtsR5WXOTtucMft4EJOs6aF1/TPPP2fbiT66qNx2G97WQgplrCOvzD/VxrT34Z0I+ib3 7+IeTV4Qqft3ERsXRyGaPG1s7lunfvCuUeIk4Gt0z8SBQaXGxVENLV+j88/kbLp5nc3qFv L3GOPHNW5PItRs0oWuJm5ms+8pac5+o= X-MC-Unique: xlWp7LzLOXKgYQ-pJqG3rw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297775; x=1693902575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FG4l56w7PVcMl8GBpWCdbsM/10Bco9m9+W4L22ZsEjQ=; b=htio66Socs74mW1ou3fNKFzW2ZnQY39lEPVmt3p1HwpUErJOzAlCjGmSwuq3n8HpxQ qdTxZZfXAbuJ1C7FIqJynFnURdtVMqXn/dbSZtBjwzlEYk7eNyywpdtnGewNnoqNyoDy OlIsh+Lb6CCE1A6/0ycM58oIDgq+scyAmODWcwARpXBVrDCN4uvqZaj6MVDdC2cNDZF4 bUy6IjRn+ihSnVTD1wYdzyuix+HlvLrXiTHWsn8WxKGvpacbdTZaUOm0i+Qqvbmn+Jbn ZV91Tp6vsvald27i/utdBzNhOiN7TzYWx5FSFWV0GDo/2kVwIjaWyt/8TX1MB0VLl/gW yL7A== X-Gm-Message-State: AOJu0YwOD0j/EZstcehZ3MG5ifB7jaf3FGPa1c2RSTtvyEXCbkbG8ICE JPCUMd8waD8ymtEUYfn0AapGpSsTtpTCbc+44vS5r5RTJ8UB54Ei69Nk8A93nrIoy9H1QrPoZDb 14BRTm4RsgGmyrRQ1SZakkBo786aztVKFpq2kBvm5lbSPXDwd37L5jGfQfOAxYqTtYRJB0GsPL8 0= X-Received: by 2002:a5d:6a43:0:b0:317:f7b0:85f with SMTP id t3-20020a5d6a43000000b00317f7b0085fmr19443195wrw.33.1693297775651; Tue, 29 Aug 2023 01:29:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRfAbNHz+m2+OsmrTr3DksdkxPxB8QDKuyTa+C/A4sdl9Hb8vlhvOctYysheBTwxk4GR3/iw== X-Received: by 2002:a5d:6a43:0:b0:317:f7b0:85f with SMTP id t3-20020a5d6a43000000b00317f7b0085fmr19443186wrw.33.1693297775270; Tue, 29 Aug 2023 01:29:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/10] meson: do not unnecessarily use cmake for dependencies Date: Tue, 29 Aug 2023 10:29:22 +0200 Message-ID: <20230829082931.67601-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297851143100004 Content-Type: text/plain; charset="utf-8" Both gvnc and sysprof-capture come with pkg-config files, so specify the method to find them. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/migration/meson.build | 2 +- tests/qtest/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index ac71f132901..a91aa61c659 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,4 +1,4 @@ -sysprof =3D dependency('sysprof-capture-4', required: false) +sysprof =3D dependency('sysprof-capture-4', method: 'pkg-config', required= : false) glib_static =3D dependency('glib-2.0', version: glib_req_ver, required: fa= lse, method: 'pkg-config', static: true) =20 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index b071d400b37..df63909ee51 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -321,7 +321,7 @@ qtests =3D { } =20 if vnc.found() - gvnc =3D dependency('gvnc-1.0', required: false) + gvnc =3D dependency('gvnc-1.0', method: 'pkg-config', required: false) if gvnc.found() qtests +=3D {'vnc-display-test': [gvnc]} qtests_generic +=3D [ 'vnc-display-test' ] --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297888; cv=none; d=zohomail.com; s=zohoarc; b=C1KN1H/dTMMwDD6pnZML6PINdW3ntG1btguoHDiKcCOqpGeIUpYADQCUS+MUdnn+eiD6v7klusUTekXsBLYX7iFGTRpOm7qUBWFYbgSiVnsmqS87K5oN0KTUgX96353MdwIBzM7Cd0HapS2s04NxarLY/1Wnoh/zt1NAzAiVnQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297888; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UbINoetYo4VP8iqmSjHGVe74IecBpQ2pTHYEBg3wUwQ=; b=n0JezIbuZ1Sc2fi4RVQOHZZaWHu+Ra9VP/gHpVexCiFRMeLiNjTlj3nVaOAkB0Vz4Z00U3VzuXfe5tAVqmNQX7NeM6lpcVIuaooVfF4TqhvTeNNl4kvqAOv9I/+CPuGaropuiUSR5ukd9AO0r3lfCtxRcy6o/4Hy3B2XGTPRtgI= 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 1693297888555221.5810594902398; Tue, 29 Aug 2023 01:31:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6q-0002ns-8j; Tue, 29 Aug 2023 04:30:00 -0400 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 1qau6f-0002dN-0f for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6Y-0008Qi-R8 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:48 -0400 Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-251-GVucSB8_N2yXlC1unOENVQ-1; Tue, 29 Aug 2023 04:29:39 -0400 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-5007f3d3255so4539827e87.3 for ; Tue, 29 Aug 2023 01:29:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id m30-20020a05600c3b1e00b00401d8181f8bsm866628wms.25.2023.08.29.01.29.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UbINoetYo4VP8iqmSjHGVe74IecBpQ2pTHYEBg3wUwQ=; b=jTTxJdDB1Fw0Ve603Q4wHBDX63Y6gZrmFQ9n6eZ5z2vPBNT/xS1bqwiDe9LAhzQAp2WXWI u+ZmpKv8xxe5ejQeslYWP8MqFD7trsv5SbrLn571Yr+y/qjaeS40Hc66DmRYxnDJOn500J ASkTjp4VyENym6io/2L/JR4TFfGvEjA= X-MC-Unique: GVucSB8_N2yXlC1unOENVQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297777; x=1693902577; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UbINoetYo4VP8iqmSjHGVe74IecBpQ2pTHYEBg3wUwQ=; b=WeGClmhgfOLy3mgwmFEVFiKfMYGXeIXltAA2/Gcf1DHFuGCkSz4HRWgalL6etWKFyq IjprHNhRVJZZU9k63EqZQnbAr/lSjQur/fl0lD6JcaJ9Z1cEaKVjIZfBtBI1bRC05pvy kBdtsBF/pkTgm8qaSMoJDQtcsjjnj7wQ8TraZerdcKS0UJu5IHCNr9OAy4vJHNMzyaUu cBONts5F5xDqGiBulqj3Vl/6gr7Ly8bwWMCISnFZxsMcdz/2iKj7peX162tY9cCWbDC2 60e1hkKJzWA31q/foVKkwNndoTLBffu70j4PyngFe72o6qZSnQtcEf+ZKsBiiCHRBOoy OU2g== X-Gm-Message-State: AOJu0YyQ6uaI2+0v2HuMin1ZEgi+T7rNDrDn6DLVKd2YSoDWbdAtbPwq K0PojmXxrIVLgr9fgZxJ4vkM+SGgNlioEqCsCn9LxluUtm4Db5Fj7BBHYg6T5uBizXmqzO3Xzmy BfidHPXfzyYNVo+lyPrUyh6b4grdwwqTEP1OtIhnzdH0nSkDNnGkGxQgLARyrx3K3MCGP52s7ek Y= X-Received: by 2002:a19:9102:0:b0:500:a408:dbd with SMTP id t2-20020a199102000000b00500a4080dbdmr7516441lfd.55.1693297777442; Tue, 29 Aug 2023 01:29:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+iGk6tyqDQKeteFpkPaL6fexbu+KeSkyYw699YsrBsgG+TRwSNwEEnY2a8tyuB9alt4MXyw== X-Received: by 2002:a19:9102:0:b0:500:a408:dbd with SMTP id t2-20020a199102000000b00500a4080dbdmr7516424lfd.55.1693297776836; Tue, 29 Aug 2023 01:29:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/10] meson: update unsupported host/CPU messages Date: Tue, 29 Aug 2023 10:29:23 +0200 Message-ID: <20230829082931.67601-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297888835100002 Content-Type: text/plain; charset="utf-8" Unsupported CPU and OSes are not really going away, but the project simply does not guarantee that they work. Rephrase the messages accordingly. While at it, move the warning for TCI performance at the end where it is more visible. Signed-off-by: Paolo Bonzini --- meson.build | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 98e68ef0b1e..02b035a3808 100644 --- a/meson.build +++ b/meson.build @@ -678,9 +678,7 @@ endif tcg_arch =3D host_arch if get_option('tcg').allowed() 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 + if not get_option('tcg_interpreter') error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu= )) endif elif get_option('tcg_interpreter') @@ -4317,28 +4315,34 @@ summary_info +=3D {'selinux': selinux} summary_info +=3D {'libdw': libdw} summary(summary_info, bool_yn: true, section: 'Dependencies') =20 -if not supported_cpus.contains(cpu) +if host_arch =3D=3D 'unknown' message() - warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!') + warning('UNSUPPORTED HOST CPU') message() - message('CPU host architecture ' + cpu + ' support is not currently main= tained.') - message('The QEMU project intends to remove support for this host CPU in= ') - message('a future release if nobody volunteers to maintain it and to') - message('provide a build host for our continuous integration setup.') - message('configure has succeeded and you can continue to build, but') - message('if you care about QEMU on this platform you should contact') - message('us upstream at qemu-devel@nongnu.org.') + message('Support for CPU host architecture ' + cpu + ' is not currently') + message('maintained. The QEMU project does not guarantee that QEMU will') + message('compile or work on this host CPU. You can help by volunteering') + message('to maintain it and providing a build host for our continuous.') + message('integration setup.') endif =20 if not supported_oses.contains(targetos) message() - warning('WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEAS= ES!') + warning('UNSUPPORTED HOST OS') + message() + message('Support for host OS ' + targetos + 'is not currently maintained= .') + message('The QEMU project does not guarantee that QEMU will compile or') + message('work on this operating system. You can help by volunteering') + message('to maintain it and providing a build host for our continuous.') + message('integration setup.') +endif + +if host_arch =3D=3D 'unknown' or not supported_oses.contains(targetos) message() - message('Host OS ' + targetos + 'support is not currently maintained.') - message('The QEMU project intends to remove support for this host OS in') - message('a future release if nobody volunteers to maintain it and to') - message('provide a build host for our continuous integration setup.') message('configure has succeeded and you can continue to build, but') + if host_arch =3D=3D 'unknown' and get_option('tcg').allowed() and target= _dirs.length() > 0 + message('QEMU will use a slow interpreter to emulate the target CPU;') + endif message('if you care about QEMU on this platform you should contact') message('us upstream at qemu-devel@nongnu.org.') endif --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297849; cv=none; d=zohomail.com; s=zohoarc; b=lCDzlnQ2Y+b7lJz/UgIMOgrNi3ht+snte4AaTsAeehMiyKEaTlshJu8omyLXDnAE2ggEW5OKWL2tflIDkvFpW2PzSrlJPzjeIUeMYP2LKvMVEEgfmqOHHMU+GU45JGYJfQbrBdIRv97YYSTF+UN6RqJevyVdw1ITQxL0mVfbPG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297849; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AouVmZmtK7J+Cy4ZSfvQOHcTgPdMRLqJWR/mWaTU8Rg=; b=OOjHI10az8DR2ESqvGRrxPkG+AO0iiwILtRBl5CrtuwzWANw9+4dVpYGNvag8TaUIbpqkGBEyDGz1srKJZl87I8nlMbWl/61xLYtCuo3VE1hX8PZDPh/dE2vx6o912cVqJJX2TaoUo1w0bq900cDgKTsThQVG/YBgydBXaJ9UTc= 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 1693297849849421.66682332405605; Tue, 29 Aug 2023 01:30:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6r-0002p4-4k; Tue, 29 Aug 2023 04:30:02 -0400 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 1qau6e-0002dM-UD for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6Y-0008Ql-Kc for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:48 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-e7QLVZ6oNiy5dpLUBJcY4g-1; Tue, 29 Aug 2023 04:29:40 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-317a84a3ebeso2541008f8f.0 for ; Tue, 29 Aug 2023 01:29:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id g15-20020a5d46cf000000b0031762e89f94sm12900858wrs.117.2023.08.29.01.29.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AouVmZmtK7J+Cy4ZSfvQOHcTgPdMRLqJWR/mWaTU8Rg=; b=P+XXhJMRr52S/YYa+bXj/0r8ZFda0NZP0E4FktpMJPhTKgsNfcRhLOuCC8R8/J8zpUHHqe hGv+qCI+B+7uw+gvlccqhqD8C7PVkKXz0G6oe+gPWMgf531L1/2f4eCh+IHgpOSZKNFvj4 OdeybWWXkCwLjw5CjCpsFARFgFpvvtY= X-MC-Unique: e7QLVZ6oNiy5dpLUBJcY4g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297778; x=1693902578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AouVmZmtK7J+Cy4ZSfvQOHcTgPdMRLqJWR/mWaTU8Rg=; b=Mq+JpEFEHEp7MmOneeGDiqpNKgLtCK2pTkjBSf7IoYhZPrloYc8J/XoeOlvaLUnyBT yTjcuUwFwbHCvRPKmnOXvGSb44q+MPwcWjaDekKklrAVzuKSZLEd98Zqihq7UvMAis8h ZKywixailszGU4aHFxC/ASEhItEtqYt/e3KazCwEm7o6nnMQ153cs9hhX+KoiVSI50RD ZSuWA47FJ3xl4QCyVB/RPto28ApzOpweBZkPKFr+o/bCMdliQWATBuQoYxu8gGWx80Bl NiHi6ocgV2Pfi8EBiXwQf74orgFDbZ452UNU4a8JANXOnXb07ThcDgTbbMeqI+1+kp2Y fafA== X-Gm-Message-State: AOJu0Yz6/WNe8SvEwEsobrU4M5uZED3j8VxCUoXR0gbHZVbuFgz6VNDW j4uIV7Sl/t/6sSI4gT18s2kSP4eWtwj4jtHQ2fgTYqoMx34bjURusbRjgpSC8OSLHfzmMh0L1Ka Vgitb5/gNVW19/+Dw87dqi/DkQyHyxz5kupYuRq76cso6s67QxXW1pBO0xUz9kQucMV5LZkb+6S Q= X-Received: by 2002:a5d:4cc6:0:b0:319:6997:9432 with SMTP id c6-20020a5d4cc6000000b0031969979432mr1412006wrt.1.1693297778510; Tue, 29 Aug 2023 01:29:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRg82WdyXJn9SUVz0dnj3FdWUJiY4x5v3/7/xrVoBZQj4Yej1uZxIR52B4tMWl5dqC/fWrYQ== X-Received: by 2002:a5d:4cc6:0:b0:319:6997:9432 with SMTP id c6-20020a5d4cc6000000b0031969979432mr1411994wrt.1.1693297778215; Tue, 29 Aug 2023 01:29:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/10] configure: remove HOST_CC Date: Tue, 29 Aug 2023 10:29:24 +0200 Message-ID: <20230829082931.67601-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297852033100009 Content-Type: text/plain; charset="utf-8" $(HOST_CC) is only used to invoke the preprocessor, and $(CC) can be used instead now that there is a Tricore C compiler. Remove the variable from config-host.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- configure | 1 - tests/tcg/tricore/Makefile.softmmu-target | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index b9bd008592a..3423f008d5c 100755 --- a/configure +++ b/configure @@ -1794,7 +1794,6 @@ fi mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_ho= st_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak -echo "HOST_CC=3D$host_cc" >> $config_host_mak =20 # versioned checked in the main config_host.mak above if test -n "$gdb_bin"; then diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/= Makefile.softmmu-target index aff7c1b5802..2ec0bd36225 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -28,7 +28,7 @@ TESTS +=3D test_context_save_areas.c.tst QEMU_OPTS +=3D -M tricore_testboard -cpu tc27x -nographic -kernel =20 %.pS: $(ASM_TESTS_PATH)/%.S - $(HOST_CC) -E -o $@ $< + $(CC) -E -o $@ $< =20 %.o: %.pS $(AS) $(ASFLAGS) -o $@ $< --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297911; cv=none; d=zohomail.com; s=zohoarc; b=gzHp7+ZeWpgxNIwPJEdRRM5RQA2ad0g1KxTBMsU508qUIyzI8Fi+yUenXW83mFJ0hGHn6nQim0evpv2y1Gx/Osqacir+SiSM2QZ0f7mniFiZWYwyXYTSyQIbC6CMMienMjqb+M46E0374UXVV3I6w6iwg5gyuPI05im9q0/Nbs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297911; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F+2YITt1ZYq7j1igsqUCB1nnRp6fLRIOelIupAjVtmo=; b=OYagaDwq8488ozvkcU4j5jx1p9Pp/GxmrBi98wmS6Uou1XLrZv9bnhn5r1pfG/Nm8dl3/j5RBXdLO1Ohzp0Cba5UH1gHL2g0t/YvTmDm/T0h+lvtswAyvpwnJhe4LG0FHp4H+/M8xi/feAbIJ/7lutTQTz4DZ8LnjQHTxqfs/10= 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 1693297911354878.1624998576807; Tue, 29 Aug 2023 01:31:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau72-0002rm-AV; Tue, 29 Aug 2023 04:30:12 -0400 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 1qau6f-0002dc-7M for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6a-0008Rd-4P for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:48 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-fZW6lMtSMtyjIM6vTp376Q-1; Tue, 29 Aug 2023 04:29:41 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-315af0252c2so2667625f8f.0 for ; Tue, 29 Aug 2023 01:29:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id o12-20020adfcf0c000000b0031ad2663ed0sm13007348wrj.66.2023.08.29.01.29.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F+2YITt1ZYq7j1igsqUCB1nnRp6fLRIOelIupAjVtmo=; b=IaR9Rm4MjOI7FsHfZeHnSc+N1qS1eKruBBRMLQp+tnyhtRAudujcSGm6YS+ksSywRaB6Qo uIt8oZntRCRcdW7tweISxd0NKK95v7/jkeGs1s28DNK+YNdYF59Rhxa6nPE3y3m1r2lep1 53hG03YTmf4THlZJ9wphR8irCH0VxtQ= X-MC-Unique: fZW6lMtSMtyjIM6vTp376Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297780; x=1693902580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F+2YITt1ZYq7j1igsqUCB1nnRp6fLRIOelIupAjVtmo=; b=dCk3B21bp6cOT1IyDX5AiGak69MqSENto+908200HNVBMOdwMlvtqPSKR/R0F/M4rD zAe3GWc1cYAKGVSgu98so93S8v4GEB8nKu+39jrEj9/sDLjjtiL6lJndZ8HS2Wp9uTYo i+fMJZnGSisqNljjpd1jE/IKQ09MOA93QDLnYQhyN3Q69kw9f7E01U5yj0qZv2+fqnnF ootr9HaL5xvFib8TbjVP6bLfcCV/J2Qh8yV3uN2YKRijNJ93+FvUPlfylJ6fOyqwHWe6 Y06mWkASM2ndz2D3VgEHwiik2JQ+tONZy/nmq8O3xtJLS6nrV09Ry8iod6y2ajbnp1yn UVbA== X-Gm-Message-State: AOJu0YzjZ18Qp1RLzAk+IGa8eR7YgIQV4BKWVrFG0q3GeuxumwheFccI xCiVGPDVPMxJOkhvnhdk2rPr55CR9eHXbk0h25P3y8N3sfHPLSMrMoxE+kolCpHC6wdnbeJPF0d GCmt+vn9gstia0/HNfdFCAnIznnQp01UG1y59afXuy1Em08Hdvm5R5/R91PhkCQuJzkaM8tf3Oc 0= X-Received: by 2002:a05:6000:12d2:b0:317:58eb:1e33 with SMTP id l18-20020a05600012d200b0031758eb1e33mr21791140wrx.8.1693297780303; Tue, 29 Aug 2023 01:29:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF16TgdGGqRGfH4AGXb0+AEWao7BRFwkqMCOzSCJiww53/YnYopfBFp/ygvBAbeuQn03On5iA== X-Received: by 2002:a05:6000:12d2:b0:317:58eb:1e33 with SMTP id l18-20020a05600012d200b0031758eb1e33mr21791132wrx.8.1693297780037; Tue, 29 Aug 2023 01:29:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/10] configure: create native file with contents of $host_cc Date: Tue, 29 Aug 2023 10:29:25 +0200 Message-ID: <20230829082931.67601-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297912904100009 Content-Type: text/plain; charset="utf-8" The argument of --host-cc is not obeyed when cross compiling. To avoid this issue, place it in a configuration file and pass it to meson with --native-file. While at it, clarify that --host-cc is not obeyed anyway when _not_ cross compiling. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson --- configure | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3423f008d5c..b2bc1ff5f7b 100755 --- a/configure +++ b/configure @@ -922,7 +922,7 @@ Advanced options (experts only): --cross-prefix=3DPREFIX use PREFIX for compile tools, PREFIX can be b= lank [$cross_prefix] --cc=3DCC use C compiler CC [$cc] --host-cc=3DCC use C compiler CC [$host_cc] for code run at - build time + build time when cross compiling --cxx=3DCXX use C++ compiler CXX [$cxx] --objcc=3DOBJCC use Objective-C compiler OBJCC [$objcc] --extra-cflags=3DCFLAGS append extra C compiler flags CFLAGS @@ -1886,7 +1886,6 @@ if test "$skip_meson" =3D no; then echo "windres =3D [$(meson_quote $windres)]" >> $cross echo "windmc =3D [$(meson_quote $windmc)]" >> $cross if test "$cross_compile" =3D "yes"; then - cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross echo "system =3D '$targetos'" >> $cross case "$cpu" in @@ -1903,6 +1902,14 @@ if test "$skip_meson" =3D no; then else echo "endian =3D 'little'" >> $cross fi + cross_arg=3D"--cross-file config-meson.cross" + + native=3D"config-meson.native.new" + echo "# Automatically generated by configure - do not modify" > $native + echo "[binaries]" >> $native + echo "c =3D [$(meson_quote $host_cc)]" >> $native + mv $native config-meson.native + cross_arg=3D"$cross_arg --native-file config-meson.native" else cross_arg=3D"--native-file config-meson.cross" fi --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297881; cv=none; d=zohomail.com; s=zohoarc; b=ZERgL7oKzulJ+s8pNbk4fqyMigk4xUTCYavejwa3f4S3DYxod9WujrNhu1fF/ZV9TBq8YEQK9ZE4DVIJxhCxkbL89GquTBBMX+c+Ps0uNvq1HhEKSc7ErL5Ao3Di+q2NgDaHY4FEZE25yvOEmPJZkC5G+Zsmq+TncU87/birdRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297881; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FauAQsYjXDlu9ZECvKkk/e1x+qBM0JTooSFiC+XHukk=; b=EF42V+WqN1utin7jHfxSmb1qquaufwKOcVG5yXZHZWX+tt6Un9+W5QcW555ACzJlavs14NZePJoACXsaiBAQZeCtxXdzcl3+bXwuYWJl1sEpQw+YgG0Qc2FFAjaPcP4CzgZWHspj1WMu+buiyingI9ET1hUDvJg6p+7Vj2nbFNc= 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 1693297881015618.6463726424063; Tue, 29 Aug 2023 01:31:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6p-0002nj-7h; Tue, 29 Aug 2023 04:29:59 -0400 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 1qau6h-0002fQ-50 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6c-0008Sa-I2 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:50 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-365-nHx35vO6PlGG6KedVehM9w-1; Tue, 29 Aug 2023 04:29:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-313c930ee0eso2968102f8f.0 for ; Tue, 29 Aug 2023 01:29:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id v3-20020a5d43c3000000b003140fff4f75sm12898569wrr.17.2023.08.29.01.29.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FauAQsYjXDlu9ZECvKkk/e1x+qBM0JTooSFiC+XHukk=; b=Rbq4wM51nnppdIGVcKJVNSzbeoCD3Mgs39J+06Pw75GLjXMbl6LLwobJ9aYTeHodna/fea q68t1+i/xjzkn3hRr5IJDQndP/OBqBsTbKbfsvojFTunAQRMvLHuAAeqTJwz0mGCbmoYJB 7AiYj4L+mBC7I1cxCiv4im0zIyI1VYQ= X-MC-Unique: nHx35vO6PlGG6KedVehM9w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297782; x=1693902582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FauAQsYjXDlu9ZECvKkk/e1x+qBM0JTooSFiC+XHukk=; b=ZsyKgs6GxAXlgXRDyJPVVPcyRU1H/B5s8N3IeE3pJKy/nPrilpzlbI5xod7vv2Kfab FhrkoGomZr5g0qbY2Mly+KiCKuwhNIEbHrmb+WZhqZrdXMz3smYPQtD8JXiyG3FcTmN2 4euCaKsnkKLG6tPwLtRuQwUw7iyjvjsNOi8eGmBpoff40V0oAEwLvBIWEY7/0BAf1pye wp47mjRYro5UtQcEv+hWS3TB+IbOGYhWvCdkSZME1X3QiTIZwDqgWTVdGSVui0cqjibl DqC5WWdJj3pyabzSeWAp+ClhwoSQL8ztK7dsPUhYzH0zm8Y2vCO74F6U3x6dxmLtSX0C Cr8w== X-Gm-Message-State: AOJu0YzEx07w7guW4581+3w2dcNdu4gYi4a5zVOTSPRhtWExWOxV9sLW Z88hHiOwqTWV6Luw+V4NkaxnQssLRPDmHi2sz+id0ibaK4+wTtrIyQy450eSAwp5ygyvdm4y7sT Kmi3H1i9BIBT+ytUK4mlYygtsRcs4u0cZeGTORBLBSgIMWrIXJr0AK9W8jkzUoH/HKLz1hfveSL k= X-Received: by 2002:a5d:4ace:0:b0:317:7441:1a4 with SMTP id y14-20020a5d4ace000000b00317744101a4mr20415517wrs.29.1693297782253; Tue, 29 Aug 2023 01:29:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAcG0qdxlCep6bWalsGGEEk+Z2/oaXdJbS+n0tvSNu30ljmkx8elMC2HW2127tJpVjsJby2Q== X-Received: by 2002:a5d:4ace:0:b0:317:7441:1a4 with SMTP id y14-20020a5d4ace000000b00317744101a4mr20415508wrs.29.1693297781906; Tue, 29 Aug 2023 01:29:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/10] meson: compile bundled device trees Date: Tue, 29 Aug 2023 10:29:26 +0200 Message-ID: <20230829082931.67601-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297882179100003 Content-Type: text/plain; charset="utf-8" If dtc is available, compile the .dts files in the pc-bios directory instead of using the precompiled binaries. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- pc-bios/Makefile | 19 ------------------- pc-bios/meson.build | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 pc-bios/Makefile diff --git a/pc-bios/Makefile b/pc-bios/Makefile deleted file mode 100644 index 315288df84e..00000000000 --- a/pc-bios/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# NOTE: only compilable with x86 cross compile tools -# -include ../config-host.mak - -DEFINES=3D - -TARGETS=3D - -all: $(TARGETS) - -%.o: %.S - $(CC) $(DEFINES) -c -o $@ $< - -%.dtb: %.dts - dtc -I dts -O dtb -o $@ $< - -clean: - rm -f $(TARGETS) *.o *~ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a7224ef4699..e67fa433a1b 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -57,10 +57,6 @@ blobs =3D [ 'efi-e1000e.rom', 'efi-vmxnet3.rom', 'qemu-nsis.bmp', - 'bamboo.dtb', - 'canyonlands.dtb', - 'petalogix-s3adsp1800.dtb', - 'petalogix-ml605.dtb', 'multiboot.bin', 'multiboot_dma.bin', 'linuxboot.bin', @@ -84,6 +80,27 @@ blobs =3D [ 'vof-nvram.bin', ] =20 +dtc =3D find_program('dtc', required: false) +foreach f : [ + 'bamboo.dts', + 'canyonlands.dts', + 'petalogix-s3adsp1800.dts', + 'petalogix-ml605.dts', +] + out =3D fs.replace_suffix(f, '.dtb') + if dtc.found() + custom_target(f, + build_by_default: have_system, + input: files(f), + output: out, + install: get_option('install_blobs'), + install_dir: qemu_datadir, + command: [ dtc, '-I', 'dts', '-O', 'dtb', '-o', '@OUTPUT@', '@INPU= T0@' ]) + else + blobs +=3D out + endif +endforeach + if get_option('install_blobs') install_data(blobs, install_dir: qemu_datadir) endif --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297853; cv=none; d=zohomail.com; s=zohoarc; b=BEwdrSCohgepOk2b2yRA339pvWj7VjXqbm1tEEVmaSHneN2jGAl+5BHVAbDyJo1raWDJxRGqX+J+jRaf3vEejlCsEMwwb/u3o7rJ8AZ2tBvSoVcE2AXnCF/5ipVdp9+oGGfjB/1j2Qn/uvaQbRipz/hxqqk8iXjZ7ewCBCRHzHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297853; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WTWWyRaT75f8DRqj83gMtzait4DH3XGzdwX7f3Ycivs=; b=Nep0ckUeijgvWVqAjYcnH5HmnQFJN+sR0Bky9H/jNreyW6RbpiZKNe+cmmh/NdEEkRM92P8LoFFk5+bkNt+QLb6Ir8Ry8RL/twtOwgIig5MnWODJicCJC98Et12REpIBxNoJcQc7ySmE7yfUjcYVNmWpTlvlTP+16EdSzCEiXMI= 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 1693297853183414.64857916089977; Tue, 29 Aug 2023 01:30:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6o-0002la-AF; Tue, 29 Aug 2023 04:29:58 -0400 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 1qau6h-0002fV-7w for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6d-0008TB-P0 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:50 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-KnFXfQ80PIO-hl1OFB_fPw-1; Tue, 29 Aug 2023 04:29:45 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3fe5b94bd62so29394465e9.2 for ; Tue, 29 Aug 2023 01:29:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id j14-20020adfea4e000000b003142ea7a661sm13042260wrn.21.2023.08.29.01.29.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WTWWyRaT75f8DRqj83gMtzait4DH3XGzdwX7f3Ycivs=; b=XgFjOURYMoALKru/RMnUDbAsV1uy7JTQVN21+wD4YB9cbk0W5Yg1LDCVQVDZl1EJabevqD orYaQo2gQWrV0zadT+WGMgpWfXKXmcfVVa2LOee3+ZcqTMxuwlL/YXisOeR8uzDJ3gU/L6 xl82nF5vYJGO06pSs08dq0CiX1usQuw= X-MC-Unique: KnFXfQ80PIO-hl1OFB_fPw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297784; x=1693902584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WTWWyRaT75f8DRqj83gMtzait4DH3XGzdwX7f3Ycivs=; b=kyi8kMxN8kEiPOU1wKgeaQOCIh/tR1zfdaK/vNzb2FPEalhRjR9/hi8f8u/U958Oyk JtiZaCtOyPdEizdmwlUF0Qjtb1gty/vADT4j+vz6rYwvnNfID6Azjus763gO4DIIZmeL oMPFow+UJRaEn+gfvRzbaZa3PuDOjeVg+750aHVUOlJTYaUJcu3TWY812TyUqYFucfRm h4IySkzrwWjIN0p8R0yQmN/J+PXSyXNIw+JqfAf1ahNu92BLDhCh3EylysBtyx6Qn+Mh ztThuy8sPrvb9nciuiyvki17uhUoMfdfLprxxs6ct33wP66QkVlvPEXCpNcOFbjPMz7u 3LSw== X-Gm-Message-State: AOJu0YyO71gX6LptPNDqN/dimhy7RxQk8rqlNW1dBLijd0FB2nzPBvha vTrBWvVEd6qGI1ul6L+3cu4H3nPKpzquHmMR4ymekYGRyKKjrM/HutEhKFAvpC8bIMlqLgnSHm4 RerPmRhj41w3yVF2gkIQF/OExeYN6w8Sz52ZAGoFsZO0xdcIC4YHofyhf5JtITdgrb2Doyd3YM7 w= X-Received: by 2002:a7b:cb41:0:b0:3fe:1b4e:c484 with SMTP id v1-20020a7bcb41000000b003fe1b4ec484mr21025427wmj.5.1693297783914; Tue, 29 Aug 2023 01:29:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwhBGjj4wNUFiRl/+YOOlt3RXk2y20AelA9KydU78Uf3bON+O3fyt3qNsxiXxECYzkUe629g== X-Received: by 2002:a7b:cb41:0:b0:3fe:1b4e:c484 with SMTP id v1-20020a7bcb41000000b003fe1b4ec484mr21025419wmj.5.1693297783560; Tue, 29 Aug 2023 01:29:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/10] contrib/plugins: use an independent makefile Date: Tue, 29 Aug 2023 10:29:27 +0200 Message-ID: <20230829082931.67601-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297855096100019 Content-Type: text/plain; charset="utf-8" The initial reason to write this patch was to remove the last use of CONFIG_DEBUG_TCG from the makefiles; the flags to use to build TCG plugins are unrelated to --enable-debug-tcg, and instead they should be the same as those used to build emulators (the plugins are not build via meson for demonstration reasons only). However, since contrib/plugins/Makefile is also the last case of doing a compilation job using config-host.mak, go a step further and make it use a completely separate configuration file, removing all references to compilers from the toplevel config-host.mak. Clean up references to empty variables, and use .SECONDARY so that intermediate object files are not deleted. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 --- configure | 12 +++++++++--- contrib/plugins/Makefile | 18 +++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure b/configure index b2bc1ff5f7b..4a7e7afb996 100755 --- a/configure +++ b/configure @@ -245,7 +245,7 @@ for opt do esac done =20 - +default_cflags=3D'-O2 -g' git_submodules_action=3D"update" git=3D"git" debug_tcg=3D"no" @@ -768,6 +768,7 @@ for opt do meson_option_parse --enable-debug-graph-lock "" meson_option_parse --enable-debug-mutex "" meson_option_add -Doptimization=3D0 + default_cflags=3D'-O0 -g' ;; --disable-tcg) tcg=3D"disabled" plugins=3D"no" @@ -1763,8 +1764,6 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak -echo "PKG_CONFIG=3D${pkg_config}" >> $config_host_mak -echo "CC=3D$cc" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers for KVM architectures @@ -1789,6 +1788,13 @@ if test "$ccache_cpp2" =3D "yes"; then echo "export CCACHE_CPP2=3Dy" >> $config_host_mak fi =20 +# contrib/plugins configuration +echo "# Automatically generated by configure - do not modify" > contrib/pl= ugins/$config_host_mak +echo "SRC_PATH=3D$source_path/contrib/plugins" >> contrib/plugins/$config_= host_mak +echo "PKG_CONFIG=3D${pkg_config}" >> $config_host_mak +echo "CC=3D$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak +echo "CFLAGS=3D${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins= /$config_host_mak + # tests/tcg configuration (config_host_mak=3Dtests/tcg/config-host.mak mkdir -p tests/tcg diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b2b9db9f51a..0751201bcb3 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -6,11 +6,11 @@ # programs that the main configure has already done for us. # =20 -BUILD_DIR :=3D $(CURDIR)/../.. +include config-host.mak =20 -include $(BUILD_DIR)/config-host.mak +TOP_SRC_PATH =3D $(SRC_PATH)/../.. =20 -VPATH +=3D $(SRC_PATH)/contrib/plugins +VPATH +=3D $(SRC_PATH) =20 NAMES :=3D NAMES +=3D execlog @@ -26,21 +26,21 @@ SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 # The main QEMU uses Glib extensively so it's perfectly fine to use it # in plugins (which many example do). -CFLAGS :=3D $(shell $(PKG_CONFIG) --cflags glib-2.0) -CFLAGS +=3D -fPIC -Wall -CFLAGS +=3D $(if $(CONFIG_DEBUG_TCG), -ggdb -O0) -CFLAGS +=3D -I$(SRC_PATH)/include/qemu +PLUGIN_CFLAGS :=3D $(shell $(PKG_CONFIG) --cflags glib-2.0) +PLUGIN_CFLAGS +=3D -fPIC -Wall +PLUGIN_CFLAGS +=3D -I$(TOP_SRC_PATH)/include/qemu =20 all: $(SONAMES) =20 %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< =20 lib%.so: %.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS) + $(CC) -shared -Wl,-soname,$@ -o $@ $^ =20 clean: rm -f *.o *.so *.d rm -Rf .libs =20 .PHONY: all clean +.SECONDARY: --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297908; cv=none; d=zohomail.com; s=zohoarc; b=DGMaryY1zEvSAVpLKHOWR5k6+LTiPk6Gx2CdC++vAQFEyFnncLqd5mrmMEJndUbuWlTaoZL8eRs4u5M/eJ6FglVgxQO+129vcNf7mUBuKAmdN1Qr/RN45Z66+wv0WPZAxCp8AARd+umo7iF9WNGIiK3fqaTbRl6Jpv8JxbD73Yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297908; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eSilZNN6uj3wE/WzxkcCaM21pA6e5Kt5kHbPfdJ/n44=; b=kJXG0nxPJky1vebuHHo0vYk69tGI0E+tobIEUk2AGQds+bIjvLrVaCKTJzH+MiklrSbCP2LnRSAjB2j7dJUycOZx+3QJTacfzLAqtZAfbYE8GzlleCuF70A1ZzAfI3aKxJVW+bMcr8X8M1lFOBErFFYRg1/ju8HwtVcsSQGm9pE= 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 1693297908632823.6977591798658; Tue, 29 Aug 2023 01:31:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau76-0002vJ-7t; Tue, 29 Aug 2023 04:30:16 -0400 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 1qau6j-0002kM-Da for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6g-0008Tk-9t for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:52 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-Mk2XbxmfNCyBcHWZNPoQDA-1; Tue, 29 Aug 2023 04:29:47 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3fee703462dso31861635e9.2 for ; Tue, 29 Aug 2023 01:29:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id t16-20020a7bc3d0000000b00401c9228bf7sm6705964wmj.18.2023.08.29.01.29.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eSilZNN6uj3wE/WzxkcCaM21pA6e5Kt5kHbPfdJ/n44=; b=OMZsR3uhEV3kgRAXDHvYL7uGHSL6wQCb6H6a3wQTIOfQNvMQnUqilTp0lUfV+wPtr1cpOg OJ2NbcfeYOgKzlvbpoRfx9aaYb8Lh+CKVwuQqhXOiSWJx8meJDHXZKk4qCTsxC8V2nL/32 kS7Yj2sJtctSN2VThWoc9n6hxS3LE50= X-MC-Unique: Mk2XbxmfNCyBcHWZNPoQDA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297786; x=1693902586; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eSilZNN6uj3wE/WzxkcCaM21pA6e5Kt5kHbPfdJ/n44=; b=io3yEytONS66Xi6P1u+oTqcgJ3D5l2V7TjuaLtZbg4AvHwjgsn2A8eW16NYEpezhTu nrSYPp2MmiVwFDl5fUpARFj7w1etud4bNMV8sGNs91BAX1Fa5MB07Q2A1HOCNcvNjWIc 39Efc0LJ1N9Tun+pGFVXo2fyjec+XGaJ6dAGvwqkr7dX4z8iH6KY0aIB+n7I9tLyTDyx HDwYnKTY9czAJnaBHg7EHQW/f5Y3F9LFZuxgRsXL2CpxnaiaIxhShyQpHE+L1NyRIPs2 2fZa/2lrL3VGt+QHEOzuGuVYR82cxSHPsSgX4+b1tUSU3C4a3TEsUmhCbNuLGQHPs1DP Pi7Q== X-Gm-Message-State: AOJu0Yzb5YNPoQkJ0WXYYUTOmHuehqbIhQ55DzoNnQHCOpJES3ErSlpD +COVrgkkuPrzlRJYbUvT0phV1EeNNRBARZrcYNpziyy0wIPg2Q/rkI8OMMkH0vhFKSyT+zVMrWO yuM6n1nQSM3Hq2xnLTfOnSSoyEUm8c3T0LEIL6S6Cn8oQb6mvQSRP0wiBRB1s6VrdtlOBr/5BVZ I= X-Received: by 2002:a1c:7302:0:b0:3fe:c7fe:206e with SMTP id d2-20020a1c7302000000b003fec7fe206emr21094133wmb.16.1693297785890; Tue, 29 Aug 2023 01:29:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERnp9Q8TnSzfYmV2yDL1jeeDLexLR6ugT/mo/T19iJQp9ajjK6JvxpO2BvCTnjG0oPgqZP/A== X-Received: by 2002:a1c:7302:0:b0:3fe:c7fe:206e with SMTP id d2-20020a1c7302000000b003fec7fe206emr21094110wmb.16.1693297785519; Tue, 29 Aug 2023 01:29:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/10] meson: do not use config_host to pick tap implementations Date: Tue, 29 Aug 2023 10:29:28 +0200 Message-ID: <20230829082931.67601-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297910877100007 Content-Type: text/plain; charset="utf-8" The target OS is invariant and does not depend on the configuration, so move away from config_host and just use unconditional rules in softmmu_ss. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/meson.build | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/net/meson.build b/net/meson.build index bdf564a57b2..d2d70634e5e 100644 --- a/net/meson.build +++ b/net/meson.build @@ -41,15 +41,17 @@ if have_vhost_net_user system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c')) endif =20 -system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c')) -system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c')) -system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c')) -tap_posix =3D ['tap.c'] -if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CO= NFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS') - tap_posix +=3D 'tap-stub.c' +if targetos =3D=3D 'windows' + system_ss.add(files('tap-win32.c')) +elif targetos =3D=3D 'linux' + system_ss.add(files('tap.c', 'tap-linux.c')) +elif targetos in bsd_oses + system_ss.add(files('tap.c', 'tap-bsd.c')) +elif targetos =3D=3D 'solaris' + system_ss.add(files('tap.c', 'tap-solaris.c')) +else + system_ss.add(files('tap.c', 'tap-stub.c')) endif -system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix)) -system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c')) if have_vhost_net_vdpa system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'),= if_false: files('vhost-vdpa-stub.c')) system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c')) --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297888; cv=none; d=zohomail.com; s=zohoarc; b=IutwEN01Nm3McPtkHm9t026bUmMnX0tZR6hM91jN4dWvzi7TWIzUJp42XaOsPjRzSePxAl7obhgPuyCYPNo+LNn+aGAPhg3c/8tINIQK1v2ACbjI8uhUY86Ohc/SmCCaF9Z4GIDcXHs8XtWa9aSFr/ssxH/o9SNfLZ/vfOFSTfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297888; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XPVxqiEmiMLgfe3jw2Do1706ez5s3pKp/sILgykcROs=; b=YVHY4QMXrYk/V1tBnb6V1p4zcZnAiL5F/0SlpZVDCyRBLLsqxW+J6491Ymh6ONHiBW+EHNbCceHpS8oNOt8Fr+gg128p/jBJzvkcTjWr5mo1hkir9ZQ1iP+6eQhuPTE56SiCfwYsGNbWhNwEr4zhd9OQup1FdCzfN9jOErEN9Fo= 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 16932978884801007.7810851933447; Tue, 29 Aug 2023 01:31:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau78-0002w1-Hp; Tue, 29 Aug 2023 04:30:18 -0400 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 1qau6n-0002lP-D9 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6i-0008VI-Q3 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:55 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-nLik_-EdOVycqIn6Cmid-g-1; Tue, 29 Aug 2023 04:29:50 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-317d5b38194so2102099f8f.0 for ; Tue, 29 Aug 2023 01:29:50 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id n5-20020a5d4205000000b00317ddccb0d1sm12987438wrq.24.2023.08.29.01.29.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XPVxqiEmiMLgfe3jw2Do1706ez5s3pKp/sILgykcROs=; b=i4F9c1kncE7j3SJ+/kpyJCQ+Z00fPYVHHpWkNKNQuK/bunhn8odzUsuQ0quTY6XOPGWI93 q44oNFagmnzGCTqiPsG+xW3IMv5yIUfF3ptfYFX/s6mKlxXpI1XJgZPUFm/kndaVJhXbRl 0yBOLa6wcUqtAHnUoamDf7oRoQCQKo4= X-MC-Unique: nLik_-EdOVycqIn6Cmid-g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297788; x=1693902588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XPVxqiEmiMLgfe3jw2Do1706ez5s3pKp/sILgykcROs=; b=cPfXIsMFPnfxWZDzXLPJa6nxWtlv7QyXv8Onelt09dRz9fTZAwcd8XN9orihSfITl3 OTvR/CDLldWLm0iptXC+tcToCk5Kyk7YlNrLS34KnQHMugbgJ8hFmIUl7fEIpHS5EJvK loWzjdHg5T3aKncw1UOYhRZeLc+OdAVkEcNJb70J1InyDgSX4Y4wDxSJTSxvDAZDRHS4 GiA2XawBtNG8efZrqiSgNFQT6GQDG7CFKj6VLtpGu8NOt0WZTsDzAHKJk2he1+BI5hyi Y7mYyI+XUlcjLCRlWpKO8kqSVH2yepWzTfycnkVj01PGlmhk18Z9sd653a/ExK+8F8D8 UW1Q== X-Gm-Message-State: AOJu0YxH9LkpMwMTwNwgwmdeDwL5vbTGErkgyq/U5J/kRbdQZoEMqNY/ tUWxet8hlClufeBRgva47jRxYBYzrsRHqpIzBo/doU/hcdkMvec6E18//TtQkxN7lrdyLuV8Us6 fRdd9pAID+pxhDAUIGc5Il8mmMo0JPsXXuBojT526U/kLTDL152mgRy9otrrWNPAveLaaDkEesp k= X-Received: by 2002:a5d:4f0c:0:b0:317:a499:72c8 with SMTP id c12-20020a5d4f0c000000b00317a49972c8mr1388507wru.1.1693297788694; Tue, 29 Aug 2023 01:29:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFlgVfSPPwtYGenPVz5Ke9uTraZ1mmKJisAfPvr0OAdfi0uKnxNxbJ/48HWdeq9xgnsn/wiQ== X-Received: by 2002:a5d:4f0c:0:b0:317:a499:72c8 with SMTP id c12-20020a5d4f0c000000b00317a49972c8mr1388494wru.1.1693297788450; Tue, 29 Aug 2023 01:29:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/10] configure, meson: move simple OS definitions to meson Date: Tue, 29 Aug 2023 10:29:29 +0200 Message-ID: <20230829082931.67601-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297888823100001 Content-Type: text/plain; charset="utf-8" CONFIG_DARWIN and CONFIG_SOLARIS are only used in C sources. Move them to config_host_data. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 12 ------------ hw/9pfs/meson.build | 4 +++- meson.build | 2 ++ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 4a7e7afb996..eba5befa2cf 100755 --- a/configure +++ b/configure @@ -377,7 +377,6 @@ fi mingw32=3D"no" bsd=3D"no" linux=3D"no" -solaris=3D"no" case $targetos in windows) mingw32=3D"yes" @@ -402,10 +401,6 @@ openbsd) ;; darwin) bsd=3D"yes" - darwin=3D"yes" -;; -sunos) - solaris=3D"yes" ;; haiku) pie=3D"no" @@ -1726,13 +1721,6 @@ if test "$linux" =3D "yes" ; then echo "CONFIG_LINUX=3Dy" >> $config_host_mak fi =20 -if test "$darwin" =3D "yes" ; then - echo "CONFIG_DARWIN=3Dy" >> $config_host_mak -fi - -if test "$solaris" =3D "yes" ; then - echo "CONFIG_SOLARIS=3Dy" >> $config_host_mak -fi echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak =20 diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index 2944ea63c38..c6a2ccfcc85 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -14,7 +14,9 @@ fs_ss.add(files( 'coxattr.c', )) fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) -fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c')) +if targetos =3D=3D 'darwin' + fs_ss.add(files('9p-util-darwin.c')) +endif fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c')) system_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) =20 diff --git a/meson.build b/meson.build index 02b035a3808..d3d10140c57 100644 --- a/meson.build +++ b/meson.build @@ -2070,6 +2070,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_= whitelist_in_tools')) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) +config_host_data.set('CONFIG_DARWIN', targetos =3D=3D 'darwin') config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) config_host_data.set('CONFIG_GCOV', get_option('b_coverage')) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) @@ -2125,6 +2126,7 @@ if seccomp.found() config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc) endif config_host_data.set('CONFIG_SNAPPY', snappy.found()) +config_host_data.set('CONFIG_SOLARIS', targetos =3D=3D 'sunos') config_host_data.set('CONFIG_TPM', have_tpm) config_host_data.set('CONFIG_TSAN', get_option('tsan')) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297849; cv=none; d=zohomail.com; s=zohoarc; b=UKzunXg6KSY1wEj8t7K7DylhMGHhkBsJuURqs7TKpoJArPoqqqeJBOEWKSggmet00M9gbkniK2GjvHxpkrBnbOEtngJxqOmJiuTcj1uBgZzfaJHpzR6N+x8oz0K3rFTrUI0Yxs7PhzeS8EMYSK9Y+4mpR0dZ+xcChO8Icf8WYJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297849; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+fEPE6imw9pNRhe5WjUmgvjA1HD5DJ/ZMykyxx3rt30=; b=KshXKBx4QA/o75XPQzm0NGYNcaeZnZhjtIfm9Xc5VGeK5yGGJkW4BTyqvzN5jWOxP6ghe4nBIVC3UEMk9VXsltQfxt9cCNWj2ZYo4tJsg3WxQD2QNNfq+BR4bPswWMq1HsnSB30GEPQepjQh4IbmdigEZvskQqXrFCkEwG/rS44= 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 1693297849880375.36971783400213; Tue, 29 Aug 2023 01:30:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau6y-0002qQ-MM; Tue, 29 Aug 2023 04:30:10 -0400 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 1qau6p-0002nq-D3 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6l-000064-83 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:29:59 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-101-B1Kuom3DP8aOQt-03p796A-1; Tue, 29 Aug 2023 04:29:51 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3fe182913c5so30397325e9.0 for ; Tue, 29 Aug 2023 01:29:51 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id a14-20020a5d508e000000b0031ad2f9269dsm12972481wrt.40.2023.08.29.01.29.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+fEPE6imw9pNRhe5WjUmgvjA1HD5DJ/ZMykyxx3rt30=; b=f+gi8sIpJZ1YozMomtEsmwHjMyL3Vl0eYeX2kYWy+aHULd7kYU7edNj1b4FrFmD3d+4Zgq bo/VWY+3gctyX44NTeTmcG5POEiAsX3cr0UMh9B5KI3ONpg3GcZptcQqTEkITrQ82TwOIX 6BfoDjNudGcjvt8bz1WsR1MJaWnjl5Y= X-MC-Unique: B1Kuom3DP8aOQt-03p796A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297790; x=1693902590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fEPE6imw9pNRhe5WjUmgvjA1HD5DJ/ZMykyxx3rt30=; b=Q8AAn0pNrEMQUAtdomcX40PRqWxAMlH8xByacZC5+bFFs6AtIrsnOeiE30OD+D6bNy q5zH5N3TR+QT8yTsqe4E0qL4XfWU6xXX0Pmh6q3Wv/tC/0zp3bFGDNqDg22XPIvwbqAW uiRo2fqLhbyPy2aX2scEz04FZQhe/2HlKL6Gc70dzxUYtt3eBbHsAOmOE0DmeHFtAeT3 /sdKQKsTc+26jJG/LkvemTg7NFBbiTu4Uj9mBRPG2KbFpSLY8YLuNEhsWh/SrQJk+Zdm Ksjjnv5M8Z71UVbllSxugqnDCUwtHBhzb08hzunCwbInfA6nruuJUg6lHwemH/DZK1bW UaMA== X-Gm-Message-State: AOJu0YxVstEwhKTiZFawPYcsgvCLAugGDUJoeZeJR4ke/Z32lIZDgfHA DdtYBIcze02lQ1qpRC+1q4WjLSkGEvI7OWzqo0M7tzDb9jt3z5SX11RTGC/8ZBB0h2YT6LQlI0+ G3yLoY1m6la/mlO8vnPrG5zdL2vcC0Jwag1mi1Ret6fDTE+b0ARPZDLgumjZaGfttgy5+jjP6E1 s= X-Received: by 2002:a1c:f304:0:b0:3fe:4900:db95 with SMTP id q4-20020a1cf304000000b003fe4900db95mr22395818wmq.37.1693297790130; Tue, 29 Aug 2023 01:29:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEW7pYsc38pVgh9dfzULYGDsZyGaVx6wch6m+ki9+BSUvmy+FugDPJGiOSPxICxBLxc9cnbJA== X-Received: by 2002:a1c:f304:0:b0:3fe:4900:db95 with SMTP id q4-20020a1cf304000000b003fe4900db95mr22395802wmq.37.1693297789737; Tue, 29 Aug 2023 01:29:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/10] configure: remove $linux and $mingw32 variables Date: Tue, 29 Aug 2023 10:29:30 +0200 Message-ID: <20230829082931.67601-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1693297852036100010 Content-Type: text/plain; charset="utf-8" Just use $targetos always. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/configure b/configure index eba5befa2cf..aed48db68fd 100755 --- a/configure +++ b/configure @@ -374,12 +374,9 @@ fi =20 # OS specific =20 -mingw32=3D"no" bsd=3D"no" -linux=3D"no" case $targetos in windows) - mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; @@ -405,9 +402,6 @@ darwin) haiku) pie=3D"no" ;; -linux) - linux=3D"yes" -;; esac =20 if test ! -z "$cpu" ; then @@ -622,7 +616,7 @@ do fi done =20 -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows" ; then EXESUF=3D".exe" prefix=3D"/qemu" bindir=3D"" @@ -805,7 +799,7 @@ for opt do ;; --enable-download) download=3D"enabled"; git_submodules_action=3Dupdate; ;; - --enable-plugins) if test "$mingw32" =3D "yes"; then + --enable-plugins) if test "$targetos" =3D "windows"; then error_exit "TCG plugins not currently supported on= Windows platforms" else plugins=3D"yes" @@ -1070,7 +1064,7 @@ fi # by default. Only enable by default for git builds if test -z "$werror" ; then if test -e "$source_path/.git" && \ - { test "$linux" =3D "yes" || test "$mingw32" =3D "yes"; }; then + { test "$targetos" =3D linux || test "$targetos" =3D "windows"; };= then werror=3D"yes" else werror=3D"no" @@ -1708,7 +1702,7 @@ echo all: >> $config_host_mak if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows"; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO-Linux}" >> $config_host_mak @@ -1717,7 +1711,7 @@ else echo "CONFIG_POSIX=3Dy" >> $config_host_mak fi =20 -if test "$linux" =3D "yes" ; then +if test "$targetos" =3D "linux" ; then echo "CONFIG_LINUX=3Dy" >> $config_host_mak fi =20 @@ -1755,7 +1749,7 @@ echo "NINJA=3D$ninja" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers for KVM architectures -if test "$linux" =3D "yes" && test -n "$linux_arch"; then +if test "$targetos" =3D "linux" && test -n "$linux_arch"; then symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm fi =20 --=20 2.41.0 From nobody Tue May 14 02:40:06 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693297908; cv=none; d=zohomail.com; s=zohoarc; b=icKdb6haojv+vWIk62WFa/INVEeJJmjmE5JnESWYf530ZEW59Zb7r/quXLTWAzXuVKaR69/ekL1NyS/49Aud0GoJuB269Lr2FCkd4eTkIYI7YvDOy1Lwi2RKTr0rlpscj9KAgPEffCydaLBOmFaqQHE9WKlY8f7w2jTnLzcM34c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693297908; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J1wX7GyzcnzxIJysEaD63+jXx/A14PVyPXKg2CU7Syc=; b=aYhE2meAgp8svm6zGwy8myOjlxpEa0qvb0AMrsv4QIRkoYPD9CilS3Olg0r/mitfxWPZakD2XYDcKnSdenkw4kOseRSnG1dOiWOEBpF8oXFDWmEhXbVuwu6RTPbn2gSRG9lu44TUg7rBnVRKO0QdBCz3jYoU56PAR3QLS/Kdp1c= 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 169329790851359.30716449496367; Tue, 29 Aug 2023 01:31:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qau76-0002vH-6x; Tue, 29 Aug 2023 04:30:16 -0400 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 1qau6y-0002rV-Uh for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:30:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qau6n-00006e-2c for qemu-devel@nongnu.org; Tue, 29 Aug 2023 04:30:06 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-WiwoOuYaN42uHPGcIQlCEg-1; Tue, 29 Aug 2023 04:29:53 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-31c879c41f4so1668691f8f.2 for ; Tue, 29 Aug 2023 01:29:53 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id h4-20020adffa84000000b003197b85bad2sm13040149wrr.79.2023.08.29.01.29.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 01:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693297795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J1wX7GyzcnzxIJysEaD63+jXx/A14PVyPXKg2CU7Syc=; b=UP5/02y86YbwSgJl7xcgQRHJk7oDTB/9sUoqiRRdwPNWVi77cMwS68YrDravho76KEVq2f xrGlmzidY8/dHuGf5rGaTQ6zpjFA6Plnpm7xyVzge1iZJ2xV79v8lGqhi1+TwwvYrZ8Bqt OhdwPUGgimJGBjKu3yF+Wn/bSFtSSag= X-MC-Unique: WiwoOuYaN42uHPGcIQlCEg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693297791; x=1693902591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J1wX7GyzcnzxIJysEaD63+jXx/A14PVyPXKg2CU7Syc=; b=LZhsKypJxLjPayF0GD+Rgsisuwn+fAAsnB9+HBR1da+dn5gd5pE6Z3ZfeSI4k9UFh2 RbWKqW+OiBntsVBDupIMuvlyvJspPfnryhFl59amq7P/58qm6TnFpJoLyi4yYFlCftbH /iWJ+mFv5PeXgTa+PxwlNkRPckODTvirJ12MlvQU3FcISAMAbGxAuca/vKQ4HW72hzN9 7p77z2wVtY67+eGkCJjEEYl8WuI0u4BQ2n/JjClhaeKNfzhoYOg5Jng/Aefr01POmfVZ LduxLl0DiZa9S8JR7mCM9eoZKZU5SEXNDh8Ro4/DEFxiHikCHcsEU25nFSP/zjTGSRo3 l4mA== X-Gm-Message-State: AOJu0YwXuoA+LaYqboOUKFPRjXNg+FvvIRCvMjbl/vkMy5TpHLexLmdq ld5/Nqb1ZUq5j5wRvgkOYitcEneIZ+dPk34+Xd8baDYmZtQRmXGHtBJ873vDxTsC2QZqwSwUlWH 1Xj/e/0mbEBLPc06lkZUDq4UtvOdaJQaJbO1aRuksIOHyAIOg5rW2AQs7JnbQs5xQiLuQfynS1W U= X-Received: by 2002:adf:ce82:0:b0:317:5ddd:837b with SMTP id r2-20020adfce82000000b003175ddd837bmr20641255wrn.7.1693297791722; Tue, 29 Aug 2023 01:29:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFCCxBD66AGMOKiJxCA0IaxVqTgazvj4VFj4ztQwSr2NhT1gJJMHfJ8xFvynLr6KgQafX/Bg== X-Received: by 2002:adf:ce82:0:b0:317:5ddd:837b with SMTP id r2-20020adfce82000000b003175ddd837bmr20641241wrn.7.1693297791315; Tue, 29 Aug 2023 01:29:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/10] configure: move --enable-debug-tcg to meson Date: Tue, 29 Aug 2023 10:29:31 +0200 Message-ID: <20230829082931.67601-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com> References: <20230829082931.67601-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693297909287100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 11 +---------- meson.build | 3 ++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/configure b/configure index aed48db68fd..40729a6d5f5 100755 --- a/configure +++ b/configure @@ -248,7 +248,6 @@ done default_cflags=3D'-O2 -g' git_submodules_action=3D"update" git=3D"git" -debug_tcg=3D"no" docs=3D"auto" EXESUF=3D"" prefix=3D"/usr/local" @@ -747,13 +746,9 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --enable-debug-tcg) debug_tcg=3D"yes" - ;; - --disable-debug-tcg) debug_tcg=3D"no" - ;; --enable-debug) # Enable debugging options that aren't excessively noisy - debug_tcg=3D"yes" + meson_option_parse --enable-debug-tcg "" meson_option_parse --enable-debug-graph-lock "" meson_option_parse --enable-debug-mutex "" meson_option_add -Doptimization=3D0 @@ -948,7 +943,6 @@ cat << EOF linux-user all linux usermode emulation targets bsd-user all BSD usermode emulation targets pie Position Independent Executables - debug-tcg TCG debugging (default is disabled) =20 NOTE: The object files are built at the place where configure is launched EOF @@ -1699,9 +1693,6 @@ echo >> $config_host_mak =20 echo all: >> $config_host_mak =20 -if test "$debug_tcg" =3D "yes" ; then - echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak -fi if test "$targetos" =3D "windows"; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak diff --git a/meson.build b/meson.build index d3d10140c57..45f9cc62a60 100644 --- a/meson.build +++ b/meson.build @@ -2201,6 +2201,7 @@ config_host_data.set10('CONFIG_COROUTINE_POOL', have_= coroutine_pool) config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lo= ck')) config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex')) config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_u= sage')) +config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_GPROF', get_option('gprof')) config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block= _migration').allowed()) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) @@ -4158,7 +4159,7 @@ if config_all.has_key('CONFIG_TCG') summary_info +=3D {'TCG backend': 'native (@0@)'.format(cpu)} endif summary_info +=3D {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')} - summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEBU= G_TCG')} + summary_info +=3D {'TCG debug enabled': get_option('debug_tcg')} endif summary_info +=3D {'target list': ' '.join(target_dirs)} if have_system diff --git a/meson_options.txt b/meson_options.txt index aaea5ddd779..5d6b889554c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,6 +83,8 @@ option('xen_pci_passthrough', type: 'feature', value: 'au= to', description: 'Xen PCI passthrough support') option('tcg', type: 'feature', value: 'enabled', description: 'TCG support') +option('debug_tcg', type: 'boolean', value: false, + description: 'TCG debugging') option('tcg_interpreter', type: 'boolean', value: false, description: 'TCG with bytecode interpreter (slow)') option('safe_stack', type: 'boolean', value: false, diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9da3fe299b7..5567fd29985 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -29,6 +29,7 @@ meson_options_help() { printf "%s\n" ' --enable-debug-mutex mutex debugging support' printf "%s\n" ' --enable-debug-stack-usage' printf "%s\n" ' measure coroutine stack usage' + printf "%s\n" ' --enable-debug-tcg TCG debugging' printf "%s\n" ' --enable-fdt[=3DCHOICE] Whether and how to find the = libfdt library' printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' printf "%s\n" ' --enable-fuzzing build fuzzing targets' @@ -276,6 +277,8 @@ _meson_option_parse() { --disable-debug-mutex) printf "%s" -Ddebug_mutex=3Dfalse ;; --enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=3Dtrue ;; --disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=3Dfalse ;; + --enable-debug-tcg) printf "%s" -Ddebug_tcg=3Dtrue ;; + --disable-debug-tcg) printf "%s" -Ddebug_tcg=3Dfalse ;; --enable-dmg) printf "%s" -Ddmg=3Denabled ;; --disable-dmg) printf "%s" -Ddmg=3Ddisabled ;; --docdir=3D*) quote_sh "-Ddocdir=3D$2" ;; --=20 2.41.0