From patchwork Wed Oct 18 08:27:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iuoIu96z; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PB85wcyz20Zj for ; Wed, 18 Oct 2023 19:28:16 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uS-0000II-2r; Wed, 18 Oct 2023 04:28:09 -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 1qt1uO-0000GW-CS for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:04 -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 1qt1uM-0003YX-AV for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4bybKTa9G9RMY0v1lzFDYASsOxiC+RbIei3NGvfqoAE=; b=iuoIu96zD21/3NezNtzCllEgENPXxyLkjdThpzzjLLMvrSEDf0o/zIpzmzyXqQcsXTumb8 J0t1FDmSZz59IwD/5bIxCcwuFBQDF4RVj3hTssfXvLfL7bv/+6Cl1QiFwDKrGSdIk+70nH 4d/4mXrK6OpBT+sVPMIoP2JJCYFHGvY= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-puXPIRRePKmRTZ5evFFv0A-1; Wed, 18 Oct 2023 04:27:57 -0400 X-MC-Unique: puXPIRRePKmRTZ5evFFv0A-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9bd86510329so474150166b.0 for ; Wed, 18 Oct 2023 01:27:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617676; x=1698222476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4bybKTa9G9RMY0v1lzFDYASsOxiC+RbIei3NGvfqoAE=; b=cSNjfJF19/r5yoF2k8jbF+ZkJvd6qbhg02dX6EwCGdCEOLZsCU4TIK2a2iOARjh7En U0VtV2DJ/Hu3svkuECvS8aU6m8+42I6OUZlSG6/AvuW94oOfSNfuwivgV49wUVzuaQFt 3pXtrDdaoDuZZbZbw+yF52twwfgWZEoQTS6wlE13eNxG6ALZoUIXPLscPeULJoUAbBFX ePOACDgpl9N+MPh0Vfv2umDZTUFHht91oRzArNsIUoyNTXh7cXbFoM5vhhlexf+v/NtG VvO6gQvBpz/EGHg+7nGAroM5rThKyZjqabaIgb6lj8rY+hqQxsEKfz9CJJle54/Lx+6q TXqA== X-Gm-Message-State: AOJu0YyqBYlRSgkLcq66yAul/lDaK73bNTpEAC93tG33Z5PBtZGsR8w+ 84B0uTbn+Y5oAuUwLLLq9YvKTIlsZzOIb9OIUmBSmCgyKZmZaV6Uv1awK3WWhtvA6g5PuUWNp4w dz9nMHmIMQzPqotNpp/j+WzF5aLQ2CgmdPgphPw41LbzWxNZPfz1t8Gsk+zxM1U2elin8HMD7cl Y= X-Received: by 2002:a17:907:97d4:b0:9ae:37d9:803e with SMTP id js20-20020a17090797d400b009ae37d9803emr3530828ejc.8.1697617676159; Wed, 18 Oct 2023 01:27:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWr36RWkNc6hNrfzE5pku0+EgJji2lC+jTGeKqUnaa+vhfaN64mqUrW5Tbga6xcmzuniJZZw== X-Received: by 2002:a17:907:97d4:b0:9ae:37d9:803e with SMTP id js20-20020a17090797d400b009ae37d9803emr3530820ejc.8.1697617675835; Wed, 18 Oct 2023 01:27:55 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id lh22-20020a170906f8d600b009b94c545678sm1166560ejb.153.2023.10.18.01.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:27:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: John Snow Subject: [PULL 01/32] iotests: get rid of '..' in path environment output Date: Wed, 18 Oct 2023 10:27:21 +0200 Message-ID: <20231018082752.322306-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: John Snow Resolve the build_root before we append more items onto it so that the environment output is more concise with less parent directory confetti in it. Signed-off-by: John Snow Message-ID: <20230621002121.1609612-4-jsnow@redhat.com> Signed-off-by: Paolo Bonzini --- tests/qemu-iotests/testenv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 9a37ad91529..e67ebd254b1 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -216,7 +216,7 @@ def __init__(self, source_dir: str, build_dir: str, self.source_iotests = source_dir self.build_iotests = build_dir - self.build_root = os.path.join(self.build_iotests, '..', '..') + self.build_root = Path(self.build_iotests).parent.parent self.init_directories() From patchwork Wed Oct 18 08:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QrZD9qRW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PC54Mylz20Zj for ; Wed, 18 Oct 2023 19:29:05 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uY-0000W9-Nc; Wed, 18 Oct 2023 04:28:14 -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 1qt1uX-0000VM-L3 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:13 -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 1qt1uW-0003aZ-4z for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N4h1jQd8MPaPCiSAma/Wz/kZ98BhCtpzrw70KbY8noQ=; b=QrZD9qRWBLFf5Xk9QhCEolzfLzVmbeDNy+GdBGe/zhgN4x17kd3NcVKlrbibdBSTniWMC7 8kE9LIr2k+Dz1K4/l8efqU9rg7edyVWmzGa+hF+EbF1tsxesqb2pNYmEeJZf4GzF0+yzJo vMsFbPCkZf35eNzADtkJc36TpAIyXbU= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-252-GEcmiMqWN36J8bVyLWdHDw-1; Wed, 18 Oct 2023 04:27:59 -0400 X-MC-Unique: GEcmiMqWN36J8bVyLWdHDw-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9c57f8bbe45so160448266b.2 for ; Wed, 18 Oct 2023 01:27:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617678; x=1698222478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N4h1jQd8MPaPCiSAma/Wz/kZ98BhCtpzrw70KbY8noQ=; b=KDSDgN5tZkg1KoHx/bTI/aIAIZWa8XYs2oI3kGWr+HXBTSYLc8L0FAt8wf/tjWjamw BvqYUf/mmDkE0MX92zfjULE0bxrDoL4CdEVZBZl1A9R/i+1FJG+6rrzCvEge+IopYPWJ BrFDvIFfcK87PJLowtZ6D9UkeT0s0kq+o/sUfavmHSPjzq+OC/qFEYdSl2i9ivMCLV8k nvHlPSSAj/hvXkQMlmXNn1zU/rvZ6uS6xlzRrs6WHWlCo7Ov66gek1H/hWdEY8CX1eG5 n7pF7iVXdP8sqRBIPLoh4YbbJXKDSehcx6xNceI3qcvhqPvwyqYWxIOOFMDXfhUcWBXo SiAw== X-Gm-Message-State: AOJu0YyHY1HmzYDvhRBpuHnpilS1nJlUkP0bnEfme/5s0WnZdkUxC4D4 FC7P8cFTToHi8vHCoVvGe5rUvX9l13kYv9Ylqu+i8DYySYS3lY2sVo92/1RVfwk3uaX7FpMlc9d 6cfZRIEyfDfeQSG49lek9dQxwZrMvMIO7wkytQBSe3Lb4IlMI0J9giNr2JGpflHt8L8bqGRSSx8 s= X-Received: by 2002:a05:6402:194b:b0:53e:7372:909f with SMTP id f11-20020a056402194b00b0053e7372909fmr3582298edz.22.1697617678296; Wed, 18 Oct 2023 01:27:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgIxBHnEHFkRObKKByYT/LXRh56U11NK9ERipuIDSf1O0v50F/kRVwei3OHCoBj9dWdux5MA== X-Received: by 2002:a05:6402:194b:b0:53e:7372:909f with SMTP id f11-20020a056402194b00b0053e7372909fmr3582293edz.22.1697617678036; Wed, 18 Oct 2023 01:27:58 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id x27-20020a50d61b000000b00533dad8a9c5sm2486640edi.38.2023.10.18.01.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:27:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: John Snow Subject: [PULL 02/32] iotests: use the correct python to run linters Date: Wed, 18 Oct 2023 10:27:22 +0200 Message-ID: <20231018082752.322306-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: John Snow Whichever python is used to run iotest 297 should be the one used to actually run the linters. Signed-off-by: John Snow Message-ID: <20230621002121.1609612-5-jsnow@redhat.com> Signed-off-by: Paolo Bonzini --- tests/qemu-iotests/linters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/linters.py b/tests/qemu-iotests/linters.py index 65c4c4e8272..9fb3fd14497 100644 --- a/tests/qemu-iotests/linters.py +++ b/tests/qemu-iotests/linters.py @@ -68,7 +68,7 @@ def run_linter( :raise CalledProcessError: If the linter process exits with failure. """ subprocess.run( - ('python3', '-m', tool, *args), + (sys.executable, '-m', tool, *args), env=env, check=True, stdout=subprocess.PIPE if suppress_output else None, From patchwork Wed Oct 18 08:27:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EkfZr4Fy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PCM63jNz23jS for ; Wed, 18 Oct 2023 19:29:19 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uV-0000Q3-3t; Wed, 18 Oct 2023 04:28:11 -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 1qt1uR-0000IN-GC for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:08 -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 1qt1uP-0003Ye-6i for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W1nCveODekda2WIdboayc39x+is6XRL9Eo63iDkXcJQ=; b=EkfZr4FynidpWhiP2lBlG9U2t0/isU0X5cfQmiAyAXtgQ1KAemkPfFmejmweoU6/VktsYv 7aAxEQnDJcuNOGf2K1eLLO9LPB06tBlqOVyfSCxsdsSTXSsZCMqSiV5B1qYrPlJgq8YyrC krecnFXTIHl1HApYOziET7MhBPP7G8s= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-WSqx0jIBOEGQL8V2VAquLQ-1; Wed, 18 Oct 2023 04:28:01 -0400 X-MC-Unique: WSqx0jIBOEGQL8V2VAquLQ-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae0601d689so435222966b.0 for ; Wed, 18 Oct 2023 01:28:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617680; x=1698222480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W1nCveODekda2WIdboayc39x+is6XRL9Eo63iDkXcJQ=; b=muEyU9iLtoJJLuBVPL5Gy0qdX4WmVQyn99Egy1v7Ms3liBuTg1d9w2szr7bbcGaP6j 0aJK0EXgMBYCB5sdwOnlrzm6p7ucYyfpFt3Hqb0IsfYlJIDVeglPjSDssrWGV6AMfWaP jSA2/3R3Ac+bzGSA8jtfvj9EIu/hACiQO0bfEj5RaQCdOwEkmeSPTgXArmUdEWRp5a3w CEjHaKxX2txzEv3jReQCsmG0hG4WOoipNNPPFlPVwBeFo1BMuzaLv76KGqKpyKpq7kUd AdW2A8n2BKhjr1VxnELE8tWobZLf6H5G6Ai5CHvg9ksoigMZZPZWIZ7FBjWcBroi+Ld5 yskw== X-Gm-Message-State: AOJu0YxW9gBOZtq79d/oT84ExNwjTMOFAVw0NZxraajP8fWs4g01N76c suB7NNM/OLls3Zk3GeBAemp+40Pa9b7BakOX6DDVVtCxzNzfeSM1ht5VFowaEBvRcCRKJAAD8pY H4ISVWuyeRGe9Si/HhOYSY8nxziAIVFzFlERUaQTQvulNKZAH/jAUzS/RZbFiKoGK4Ao5PyKFFL Q= X-Received: by 2002:a17:907:72c8:b0:9bf:39f3:f11a with SMTP id du8-20020a17090772c800b009bf39f3f11amr3581438ejc.74.1697617680137; Wed, 18 Oct 2023 01:28:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6USEPHLAObRHWxstTfSO/go5mdv+Uio4A4QyZXaCVsV56qxJKEKd4flkllEo/W2RUKb8AMQ== X-Received: by 2002:a17:907:72c8:b0:9bf:39f3:f11a with SMTP id du8-20020a17090772c800b009bf39f3f11amr3581417ejc.74.1697617679800; Wed, 18 Oct 2023 01:27:59 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id ay20-20020a170906d29400b009b2c9476726sm1183470ejb.21.2023.10.18.01.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:27:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Yonggang Luo Subject: [PULL 03/32] Revert "configure: Add workaround for ccache and clang" Date: Wed, 18 Oct 2023 10:27:23 +0200 Message-ID: <20231018082752.322306-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Yonggang Luo This reverts commit fd0e60530f10078f488fa3e9591cc7db5732989c. According to https://peter.eisentraut.org/blog/2014/12/01/ccache-and-clang-part-3 it's already fixed in new version of ccache According to https://ccache.dev/manual/4.8.html#config_run_second_cpp CCACHE_CPP2 are default to true for new version ccache Signed-off-by: Yonggang Luo Message-ID: <20231009165113.498-1-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- configure | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/configure b/configure index 96d0dd5ffc9..d6103a0141f 100755 --- a/configure +++ b/configure @@ -1166,34 +1166,6 @@ EOF fi fi -######################################## -# check if ccache is interfering with -# semantic analysis of macros - -unset CCACHE_CPP2 -ccache_cpp2=no -cat > $TMPC << EOF -static const int Z = 1; -#define fn() ({ Z; }) -#define TAUT(X) ((X) == Z) -#define PAREN(X, Y) (X == Y) -#define ID(X) (X) -int main(void) -{ - int x = 0, y = 0; - x = ID(x); - x = fn(); - fn(); - if (PAREN(x, y)) return 0; - if (TAUT(Z)) return 0; - return 0; -} -EOF - -if ! compile_object "-Werror"; then - ccache_cpp2=yes -fi - ########################################## # functions to probe cross compilers @@ -1726,10 +1698,6 @@ if test "$default_targets" = "yes"; then echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak fi -if test "$ccache_cpp2" = "yes"; then - echo "export CCACHE_CPP2=y" >> $config_host_mak -fi - # contrib/plugins configuration echo "# Automatically generated by configure - do not modify" > contrib/plugins/$config_host_mak echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak From patchwork Wed Oct 18 08:27:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MAFSS++J; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PFn1Yn6z20Pd for ; Wed, 18 Oct 2023 19:31:25 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1ud-0000vV-3V; Wed, 18 Oct 2023 04:28:19 -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 1qt1ub-0000mc-MS for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:17 -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 1qt1ua-0003bs-0y for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A7xyo+qk2Hmn+FRqA7cbZGYx0K1TdHtmSr+gpBySNFg=; b=MAFSS++J9NN9Md5h3mAPIg2gAcs6QQdteNkyykJhnNtxdc8prwXvjJFyAsjZCkdCgSx7gy 8crgRz8EkmooOGK/uBguP0S67EHA1KMmaEbkoMufTNplehejM6oKR4pg1TjpgjSpSaF8AU 5VtqDPv7j8uY0tezzylbL4x0G7v484o= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-61-rh0GtM8hPvur8a2u3Qbiyw-1; Wed, 18 Oct 2023 04:28:04 -0400 X-MC-Unique: rh0GtM8hPvur8a2u3Qbiyw-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-507bd5f4b2dso1609221e87.2 for ; Wed, 18 Oct 2023 01:28:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617682; x=1698222482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A7xyo+qk2Hmn+FRqA7cbZGYx0K1TdHtmSr+gpBySNFg=; b=gJY3xmqSAz6ECtay0jiFosgAJHEUtAb262IDRr69v+2HpL3K231I9LyOq7dyjdh9WH xloFOfp0ADjGXhN/NGXbpZL3keyKVdC00sfSN/8+QJmlKjHx66B1AUgNTm5KzQhPqSFM liNi4EKeiXG3p04onPcQt9pPgp0Bvutcnsf8NBBsViWfHmY0d8mzBNmo41BgS6SwU0y5 5qMRQJBuvTvtyCC16qMnms8eBwIlnOyo9vk5SynMbC/nVEF/5TfwxDWiej0wkKIRGlPq jiyPZRaa8qX4IOJV6n3w8J2BZFVu38qUP4l3jBOuO9zbiaEWPd+qucFavanTU61/L5T9 YhiQ== X-Gm-Message-State: AOJu0Yx95Y51uxebrE1RxV+BSnop371FrI+zKPGdjzaA48vFRMLbCqWc qiexyE1ng5MlSh7DGsrj2XAIOcppCVcovKu/pwXcu1NBoUKpCPq9ZuBC0Un2yUgblz2thbDDoBR DsANtiKEZKE5CnmRU7ppXw8HrOBKB+CTd6mmm6vi9o6/djhDwcHQO6ZxG8eguLBYwPLXtTYofR3 8= X-Received: by 2002:a19:f80f:0:b0:507:ab5b:7b6c with SMTP id a15-20020a19f80f000000b00507ab5b7b6cmr3263263lff.36.1697617681913; Wed, 18 Oct 2023 01:28:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFutWX2mcIlN1/kMR5cE028bo6W7nR2my1fGLRY6y1nrSKGTRqR37ZrhKhr+YjXGIWiQLwfSw== X-Received: by 2002:a19:f80f:0:b0:507:ab5b:7b6c with SMTP id a15-20020a19f80f000000b00507ab5b7b6cmr3263247lff.36.1697617681442; Wed, 18 Oct 2023 01:28:01 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id x90-20020a50bae3000000b005342fa19070sm2434257ede.89.2023.10.18.01.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li Subject: [PULL 04/32] target/i386/cpu: Fix CPUID_HT exposure Date: Wed, 18 Oct 2023 10:27:24 +0200 Message-ID: <20231018082752.322306-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaoyao Li When explicitly booting a multiple vcpus vm with "-cpu +ht", it gets warning of warning: host doesn't support requested feature: CPUID.01H:EDX.ht [bit 28] Make CPUID_HT as supported unconditionally can resolve the warning. However it introduces another issue that it also expose CPUID_HT to guest when "-cpu host/max" with only 1 vcpu. To fix this, need mark CPUID_HT as the no_autoenable_flags. Signed-off-by: Xiaoyao Li Message-ID: <20231010060539.210258-1-xiaoyao.li@intel.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 1 + target/i386/kvm/kvm.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3aab05ddadc..bdca901dfaa 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -778,6 +778,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { }, .cpuid = {.eax = 1, .reg = R_EDX, }, .tcg_features = TCG_FEATURES, + .no_autoenable_flags = CPUID_HT, }, [FEAT_1_ECX] = { .type = CPUID_FEATURE_WORD, diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index f6c7f7e2686..ab72bcdfad1 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -373,6 +373,8 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, if (function == 1 && reg == R_EDX) { /* KVM before 2.6.30 misreports the following features */ ret |= CPUID_MTRR | CPUID_PAT | CPUID_MCE | CPUID_MCA; + /* KVM never reports CPUID_HT but QEMU can support when vcpus > 1 */ + ret |= CPUID_HT; } else if (function == 1 && reg == R_ECX) { /* We can set the hypervisor flag, even if KVM does not return it on * GET_SUPPORTED_CPUID From patchwork Wed Oct 18 08:27:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=H1Pdc6hW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PBR1NKQz20Zj for ; Wed, 18 Oct 2023 19:28:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uW-0000Tz-6B; Wed, 18 Oct 2023 04:28: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 1qt1uU-0000PQ-U5 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:10 -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 1qt1uS-0003ZB-Rk for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617687; 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=ZvnDkgkojYakbouPNQnSNioH7Xg+71/AImlTm5h72Ow=; b=H1Pdc6hWTvovxSjLl8o7kpa3RhL4ozzEj56AAKz0WLz1LfYBT+ObaF6CiinMdVDJQ6z1S1 6QomSEPteXYtT72scQFZBCBRc1qjcEjL8d8tA6dSlAAsVax63DYWkcYktXu+vjEO68tShd xY1kBNSUZtM/as+2WoSXYVJ/Hj+bVCg= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-244-B7t_9HZfMduqfynNgdd7uA-1; Wed, 18 Oct 2023 04:28:06 -0400 X-MC-Unique: B7t_9HZfMduqfynNgdd7uA-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5362b33e8ffso5105291a12.3 for ; Wed, 18 Oct 2023 01:28:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617684; x=1698222484; 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=ZvnDkgkojYakbouPNQnSNioH7Xg+71/AImlTm5h72Ow=; b=c1s4RzK1YP8O64gNGL2VpZeQuuko1+C4oaGcGxSDnc4WCyns8aTwiBsr5W9yviSNWM 6jNfiTHhD5P4QutBpGtTRUFwLdScvuLvujsznGn92MTpSkUg93QPww0xNntYwbb9AZ5Z q2kEIwODxwz2EcULqULKzxs0iQtFtfA6QT4AQ9OtO/gSQfkQn/QRNhaJ1oqCAiBQj8M5 x6bfH1XKp9+m0qClTeUz6hSjOUNaegb4Ug8MQiUUWrkhv/wlZxiaeMhI/haj3OvJz5Cx p2WW/Ck/7Hk6nsn2LF+u7u+zEOj3iG0OLJXZnRYvyNmuYPYhuhiZk5MjTCXx3kcnX3CI i2PQ== X-Gm-Message-State: AOJu0Yw7Wn1Vt+IijmMR7bQBW3gRAeGESFaof/o+Rnf/LvrsQ7nM3UPX hPxLisYiaIMGKVa6grnVzDr1QAY/n10HRKmSvTl/uxohw9hP1AlplImSAXsIObGQNWji9AmbvhM U2KPG5vWwBSZxfptmy3UfVL8qFi6Mpey8nZA/M5DNWfse947MlRXDewbtjmu3lIxsPrl6Yke2Ch w= X-Received: by 2002:a50:f616:0:b0:53e:6f96:dcf with SMTP id c22-20020a50f616000000b0053e6f960dcfmr3187527edn.34.1697617684553; Wed, 18 Oct 2023 01:28:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/FlKvS+wayjuaWYqMSY2DBn+TOCwqdqJrnF/l+E8wTZ3+cp9zEw8VZ28e7dktTaq6jmRWtQ== X-Received: by 2002:a50:f616:0:b0:53e:6f96:dcf with SMTP id c22-20020a50f616000000b0053e6f960dcfmr3187518edn.34.1697617684179; Wed, 18 Oct 2023 01:28:04 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id cx11-20020a05640222ab00b0053da777f7d1sm2386753edb.10.2023.10.18.01.28.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/32] target/i386: check intercept for XSETBV Date: Wed, 18 Oct 2023 10:27:25 +0200 Message-ID: <20231018082752.322306-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Note that this intercept is special; it is checked before the #GP exception. Signed-off-by: Paolo Bonzini --- target/i386/svm.h | 1 + target/i386/tcg/translate.c | 1 + 2 files changed, 2 insertions(+) diff --git a/target/i386/svm.h b/target/i386/svm.h index f9a785489d8..1bd78447306 100644 --- a/target/i386/svm.h +++ b/target/i386/svm.h @@ -132,6 +132,7 @@ /* only included in documentation, maybe wrong */ #define SVM_EXIT_MONITOR 0x08a #define SVM_EXIT_MWAIT 0x08b +#define SVM_EXIT_XSETBV 0x08d #define SVM_EXIT_NPF 0x400 #define SVM_EXIT_ERR -1 diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index d2061ec44a0..4f6f9fa7e52 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -5916,6 +5916,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) | PREFIX_REPZ | PREFIX_REPNZ))) { goto illegal_op; } + gen_svm_check_intercept(s, SVM_EXIT_XSETBV); if (!check_cpl0(s)) { break; } From patchwork Wed Oct 18 08:27:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jH0Jlf2A; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PC65W9Nz20Zj for ; Wed, 18 Oct 2023 19:29:06 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uX-0000Vc-Rh; Wed, 18 Oct 2023 04:28:13 -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 1qt1uW-0000UL-8V for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:12 -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 1qt1uT-0003ZK-Ry for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qs2cdu48NJ8nNMZ+IMyHr6DXt2M1atOD37VWsF3E5pY=; b=jH0Jlf2AobtcLGHF/NTg9lWxUo5JFbAeIcR68+OtVuCCjzueWuKPTo08pOJBUgsJEkn3f5 D0AJ+mllY85EMXLQgdOoIUp6gSeIU0H1iBMRrw2/J+Rl1clkMVvLJ3xb/cjJPTk81Ixn39 +S14L4VRChY6kn61ZUpX3wcprY2vkMs= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-576-XkWsb5C6MFWcO7a69Utwmw-1; Wed, 18 Oct 2023 04:28:07 -0400 X-MC-Unique: XkWsb5C6MFWcO7a69Utwmw-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99c8bbc902eso494975466b.1 for ; Wed, 18 Oct 2023 01:28:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617686; x=1698222486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qs2cdu48NJ8nNMZ+IMyHr6DXt2M1atOD37VWsF3E5pY=; b=qNUybpaViLh7zS7c1C1s3RZywts1Hc0zxx6vSjCWPiUYTlv1pydKRf6gSNBn1Jl+E4 IdlCdXrujJzXs745q1rBDTd05kQhT88hN3rieJ+ll7tL1P2Dc3TgmabCBraLY1hVHWM4 eCoeUA/9eV8k5l25n0PRLKHQHCSbXE/uls82r1MFqGCTf/ah51DFU5uRR3TNhcqsJ570 BwBQdLUvDReMbkKCue43N7bja23nA8lzCHJSnDsy8E4hgJhk544vFWdeJBUikwHAQSzU az5Fr1iiSzUqMBDdlCln5y0D4HhERfM8gTTuNMJAM2Z5CppYFJQfhB2txK8q2anRz+R6 3L4Q== X-Gm-Message-State: AOJu0YyQ4PzG7YAgiQL4ZgOgzI779KCghR7tMesVJOLqiC8hJIsHMXRt kHwc1NHEFnreW8Df4fhDrVm83TMzeSEjkCemlrOAIbXrToxixuQ54JGhFvID5V25RKXN3s04EHW sOf2qbRBXFeHVZxj5z6jxdS7WseiAm6uJi0Ksaj1B78w6WXb5eEyWjOg2ntNEOP94IuQL54IpJN E= X-Received: by 2002:a17:907:7ea8:b0:9b6:50cd:a222 with SMTP id qb40-20020a1709077ea800b009b650cda222mr3866957ejc.54.1697617686197; Wed, 18 Oct 2023 01:28:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFymaQkNqQ8KkpLXAD/zpxsAJEH6icUNfNn//G1pTbldiB6YlaaW5DoBJD+AlwlycSYSA3gQ== X-Received: by 2002:a17:907:7ea8:b0:9b6:50cd:a222 with SMTP id qb40-20020a1709077ea800b009b650cda222mr3866943ejc.54.1697617685789; Wed, 18 Oct 2023 01:28:05 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id e26-20020a170906749a00b009adc5802d08sm1177397ejl.190.2023.10.18.01.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 06/32] tests/vm: netbsd: install dtc Date: Wed, 18 Oct 2023 10:27:26 +0200 Message-ID: <20231018082752.322306-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Install dtc as it is now a mandatory external dependency in order to build QEMU. Co-developed-by: Thomas Huth Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- tests/vm/netbsd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c7e3f1e7357..40b27a34694 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -40,6 +40,9 @@ class NetBSDVM(basevm.BaseVM): "gsed", "gettext-tools", + # libs: basic + "dtc", + # libs: crypto "gnutls", @@ -67,7 +70,8 @@ class NetBSDVM(basevm.BaseVM): mkdir src build; cd src; tar -xf /dev/rld1a; cd ../build - ../src/configure --disable-opengl {configure_opts}; + ../src/configure --disable-opengl --extra-ldflags=-L/usr/pkg/lib \ + --extra-cflags=-I/usr/pkg/include {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ poweroff = "/sbin/poweroff" From patchwork Wed Oct 18 08:27:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gftmhQC/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PBX1CL2z20Zj for ; Wed, 18 Oct 2023 19:28:36 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uZ-0000Xu-DV; Wed, 18 Oct 2023 04:28:15 -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 1qt1uY-0000Vm-7a for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:14 -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 1qt1uV-0003ZZ-Gq for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WyiZ7aHaRsiX0EskWGit/toNA+1fG2kq79A9AfD8vZE=; b=gftmhQC/H7W+0SGAaPsXioGHxb/N8JnVWIkajjiTZNhCIa7RI8objCA0CrPSjtOGAyVQGf 2nZkzkB/xgdpSqRMgmBX+C/YPQdbmF7uuz+kCWC6adiFIFp7CxY1cmQ/Iu7+XyMzWRMKVJ JZVecQbp7o0vZsSfdReR6vG8YizwDTg= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-46BV6FnaMraPK6J4BwsEEg-1; Wed, 18 Oct 2023 04:28:09 -0400 X-MC-Unique: 46BV6FnaMraPK6J4BwsEEg-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-51da39aa6dcso4971674a12.2 for ; Wed, 18 Oct 2023 01:28:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617687; x=1698222487; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WyiZ7aHaRsiX0EskWGit/toNA+1fG2kq79A9AfD8vZE=; b=PsQ41U99SGl3WheJUmgdbWebWG3uIax2iEb/XfgiSowOZOqg7QsP3YMJ+YpmNHDN/B umPil2t5xEkaosnWVpRS4rW/wbu5Qp8Y+b3qgrhz8IHsuO7Zz6eM6wZiqDCuC7auBcLx L/lpc52FYNcdONAIB8OAQ2k2hf1sOFyyZsw6vb9uqwtYgPKUWIBqbvcMYnDLRC5vAHPF hXPVm9RvTKUL4vd+t+2Dhi2AQfDEFyZBeg2vTZCyLMMXdUkWIw9n7AJF2nXY45ODKFoM njRQW1BIiHW3uhN30W6tJq/EhurcsQoJoVyREAVmS1UTH2ICWTnX97H5HNEfGg0gRtW6 XJ0A== X-Gm-Message-State: AOJu0YzX2+03Y9B5oHc40n1YqJbtH4j8FY9xGv5+m04V/UXXg61TGO5M iOwR2l8zGrZ7QSfHUyQrj6NSt9LY3cAz6/vy2SDjSNBVVp7Y6E0sGXscNG1OgGepiNlykqzDPSn 5M2idlXv8WUoaDoG0aQo4UVqIFzGHEays1tA8PgiSp1dNNNxaOS3tngg3Ue7YfOX9+CtW/zjS3p I= X-Received: by 2002:a50:d08f:0:b0:525:6c74:5e58 with SMTP id v15-20020a50d08f000000b005256c745e58mr3791422edd.23.1697617687697; Wed, 18 Oct 2023 01:28:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdQypQfCBsZXbkJQLSio2YNmuYNcIAOXAgZz89bJ4wrmdOtZo4E/Bq9O+R1aTBcM4m9dO8Kw== X-Received: by 2002:a50:d08f:0:b0:525:6c74:5e58 with SMTP id v15-20020a50d08f000000b005256c745e58mr3791414edd.23.1697617687443; Wed, 18 Oct 2023 01:28:07 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id c14-20020a50f60e000000b0053dff5568acsm2470800edn.58.2023.10.18.01.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 07/32] scripts: Mark feature_to_c.py as non-executable to fix a build issue Date: Wed, 18 Oct 2023 10:27:27 +0200 Message-ID: <20231018082752.322306-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Thomas Huth Meson tries to run scripts via the shebang line if they files are marked as executable. If "python3" is not in the $PATH, or if it is a version that is too old, then the script execution fails. We should make sure to run scripts via the python3 interpreter that is used for Meson itself. For this, the files need to be marked as non-executable, then meson will use the python3 binary that has been used to run itself. Fixes: 956af7daad ("gdbstub: Introduce GDBFeature structure") Signed-off-by: Thomas Huth Message-ID: <20231016094917.19044-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/feature_to_c.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 scripts/feature_to_c.py diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py old mode 100755 new mode 100644 From patchwork Wed Oct 18 08:27:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KyS3aN1q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PFl6Qm9z20Pd for ; Wed, 18 Oct 2023 19:31:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1ub-0000hY-9Z; Wed, 18 Oct 2023 04:28:17 -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 1qt1uZ-0000Xw-DH for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:15 -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 1qt1uX-0003bT-TZ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e/iLhKRWUy46KALrFTfkLnNSvwmOOrrbKsmD+zgIYcw=; b=KyS3aN1qHvbLaFvZdyB497XKc5VdtL70dK+DzwnjqNXAzG4UJggrRHYghO7Xoi9+OIFDnY j1fNNfGSUw1M/JT4jU7e/1+OksWFcserhqzLK4bxBi2WPXdMYSrqZK+CwTOH5hvLkF3+YQ 4TUoHXjizxdD9Ppb1kQKhoyuJkJmEhs= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-rNRRpYmhPCKwtm0PMC-Dnw-1; Wed, 18 Oct 2023 04:28:11 -0400 X-MC-Unique: rNRRpYmhPCKwtm0PMC-Dnw-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9c4485166beso214025266b.3 for ; Wed, 18 Oct 2023 01:28:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617689; x=1698222489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/iLhKRWUy46KALrFTfkLnNSvwmOOrrbKsmD+zgIYcw=; b=Eu1ji+YR6qJ1+3/PIqTz7PLPoSUULcoWuOVFYT8KwE4UXVGOucbqITWVOeYf9fDAK8 nNimWsUuYUgHt7x02ZpibXzAq7dOINVgcWjHYg0eBzBLoo9l+4STvpzKYk4/j0D5zvJA EjCUgrua7bHE8Pm9aSnLwC0sotnr5LAUzkFAMtQSbQu8tWYYEuS98qRugPfLrGoVs7HU CbNz9X0ZOYLX9bJPHJfCfTWxZrMYyJyR8/U9YX5j/HYino8NqiyhoU6i5kodTnW19laD Yeeo5qKIPNkstHdyPabMOGYuv3h290cXQHlUJJZXfhJ0Pgx+0rsQPnIHxXtSuZQIoucx S7cw== X-Gm-Message-State: AOJu0Yxlpe4vHQ0f14ZhIzGmllKZ3LYs444AX0iTeTe4DHzWdlz8zf2R wIf+sVvv4MT6W391xqTCWTKrwh319h6GmhoH5Rioc3xX7Xxb7bWdQSR5u5wQxsBAYraDHA+wbJ5 1v508RUFVXXFWzcPXU1lpQaWQYnotrdxvE6dJqSv2LzWeArYH0nDCHEwvoC2Rx+qKuZyV3LuKwJ Y= X-Received: by 2002:a17:906:da88:b0:9be:e6d4:5753 with SMTP id xh8-20020a170906da8800b009bee6d45753mr3201052ejb.28.1697617689526; Wed, 18 Oct 2023 01:28:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGPj3tBZr9k+fAgH9WRREj81srrloZGBlMhZMgcIUUfbqP7jho7a4rRD+TwdbXY9qowPLyQQ== X-Received: by 2002:a17:906:da88:b0:9be:e6d4:5753 with SMTP id xh8-20020a170906da8800b009bee6d45753mr3201036ejb.28.1697617689206; Wed, 18 Oct 2023 01:28:09 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bu23-20020a170906a15700b009b2c5363ebasm1189667ejb.26.2023.10.18.01.28.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Emmanouil Pitsidianakis , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PULL 08/32] scripts/get_maintainer.pl: don't print parentheses Date: Wed, 18 Oct 2023 10:27:28 +0200 Message-ID: <20231018082752.322306-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Emmanouil Pitsidianakis When called from git-send-email, some results contain unclosed parentheses from the subsystem title, for example: (cc-cmd) Adding cc: qemu-ppc@nongnu.org (open list:PowerNV (Non-Virt...) from: 'scripts/get_maintainer.pl --nogit-fallback' (cc-cmd) Adding cc: qemu-devel@nongnu.org (open list:All patches CC here) from: 'scripts/get_maintainer.pl --nogit-fallback' Unmatched () '(open list:PowerNV (Non-Virt...)' '' at /usr/lib/git-core/git-send-email line 642. error: unable to extract a valid address from: qemu-ppc@nongnu.org (open list:PowerNV (Non-Virt...) What to do with this address? ([q]uit|[d]rop|[e]dit): d This commit removes all parentheses from results. Signed-off-by: Emmanouil Pitsidianakis Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20231013091628.669415-1-manos.pitsidianakis@linaro.org> Signed-off-by: Paolo Bonzini --- scripts/get_maintainer.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 02fa828100e..00a0870b267 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -907,6 +907,7 @@ sub get_subsystem_name { if (length($subsystem) > 20) { $subsystem = substr($subsystem, 0, 17); $subsystem =~ s/\s*$//; + $subsystem =~ s/[()]//g; $subsystem = $subsystem . "..."; } return $subsystem; From patchwork Wed Oct 18 08:27:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=V/oV78Te; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PKQ3l6qz20Pd for ; Wed, 18 Oct 2023 19:34:34 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uc-0000oq-6u; Wed, 18 Oct 2023 04:28: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 1qt1ua-0000h6-Mn for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:16 -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 1qt1uZ-0003bg-6r for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=12k6B/Wg5mmR2vWY9vc/bgGujWdlLmC+rj9GPnpZx0w=; b=V/oV78TendOyRwi4kPbsFh85d4YFCIvPnmsbHtixfz6mP7tZBAv8UExHQ00+KXtdyATwFL t40AlnxlYhuQTxtY4Cekxf3bP7jIs/wltDWl4tebntt43r3NUr8fbQcbLJSYrBXVpk4fL2 lTdb51CcE3flAFtcueaM4lUwz2rFfmU= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-zS9WPkrEOiKzbrp3An-tCg-1; Wed, 18 Oct 2023 04:28:13 -0400 X-MC-Unique: zS9WPkrEOiKzbrp3An-tCg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-993c2d9e496so457992566b.0 for ; Wed, 18 Oct 2023 01:28:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617691; x=1698222491; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=12k6B/Wg5mmR2vWY9vc/bgGujWdlLmC+rj9GPnpZx0w=; b=VOWFMdC4AJYelDUtB2W2IzpgnanHZ2vuH/+YrYnzIP64nyBMij5fnHOOO65jVMfkxX Uoq+D1TQw1PGvtAJt1WR4+HLu/I26kAOiMBnRgqjmbNIIOrs9+EYofaB3gOJDYswynYG ekmvNXipe6goFj1vROsQI8umNRHasOat9bcQU1O3itsVjAYzTWyk+Ns4ATwxUOiPwaCl +xH8+1EW984TVRQQPF+14K1bE+cfgGYp0EH+0zcuBR7sVcAzvJ9BTf4+hrge7mNZIGCf G7GfnHzNHj7/Y3D9W8hM/5LZDumiVloqeedVfAh+6KkL/0HFhOJcWeUMRtq2Ue6RS1t3 +xkw== X-Gm-Message-State: AOJu0YwqMpH6jrCNUE3ZExsRioAor2F2CehVlQHX+cNd/vxoElneykM9 nQMuszBEsRkUbJTmT9HPrrQVwsi1fMfpfmx25E+GPDJbvJxcC50v+jsIVSpGgKBjlPUO4bicKjc aKXj9UyxGSES3FgEMe3YxhDF1zkirAAbGpo6guY9QnIqUF1qNx3OKASNNcQBn8WVOT4LFudtdm0 I= X-Received: by 2002:a17:907:97c3:b0:9c5:8a6b:29e with SMTP id js3-20020a17090797c300b009c58a6b029emr3679207ejc.13.1697617691283; Wed, 18 Oct 2023 01:28:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdP0a0bIwmQUzZhm9TwDsLsY2XZ0PlcGgRHnnjWJNoH7kQYsBkAt1aaNcCB9gp3OkMP798ww== X-Received: by 2002:a17:907:97c3:b0:9c5:8a6b:29e with SMTP id js3-20020a17090797c300b009c58a6b029emr3679196ejc.13.1697617691008; Wed, 18 Oct 2023 01:28:11 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l26-20020a170906a41a00b0099d798a6bb5sm1187955ejz.67.2023.10.18.01.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 09/32] tests/docker: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:29 +0200 Message-ID: <20231018082752.322306-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 688ef62989c..3b8a26704df 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -186,7 +186,7 @@ def _check_binfmt_misc(executable): (binary)) return None, True - m = re.search("interpreter (\S+)\n", entry) + m = re.search(r"interpreter (\S+)\n", entry) interp = m.group(1) if interp and interp != executable: print("binfmt_misc for %s does not point to %s, using %s" % From patchwork Wed Oct 18 08:27:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NhW1yR0V; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PC314yFz20Zj for ; Wed, 18 Oct 2023 19:29:03 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uf-0001DW-Sq; Wed, 18 Oct 2023 04:28:21 -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 1qt1uc-0000th-O1 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:18 -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 1qt1ub-0003cA-1U for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=osYb4P7yKsOqBYf2AssoFGvXP8FQaTw6Vd8tofb+mDQ=; b=NhW1yR0VDKO8/UdVgPZI1SRvN0lnMU7wSBLtvauKgT8CCaKCu+wgmU+vNI3KEJ/H7oklE5 AEFbjy8+CH+WW1Lv0cTSo10q9sTT/KIXWospaWyJnmxpgauDZTVk+th5JzS9Si0sJkHlzB Ny6if/21W6YHeIoh5lWvQp7s8A2WB90= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-nE43XSaMOBiSbKkhEN_KwA-1; Wed, 18 Oct 2023 04:28:15 -0400 X-MC-Unique: nE43XSaMOBiSbKkhEN_KwA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso486634966b.0 for ; Wed, 18 Oct 2023 01:28:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617693; x=1698222493; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=osYb4P7yKsOqBYf2AssoFGvXP8FQaTw6Vd8tofb+mDQ=; b=IsdKsUNZz7fjU99aHztPZjMzoak3eN2Myiyxvcb4fqa8dQCsviz27vKRxDMibD955f bTXamz9YKMPM1Ewvy+ZiTOIzgArRkDkDhhNhwerXBh5pzFSGXwk/b3PQtSAYkuN2l8og 02PWbovzNXoWQ75Y+kwl5AC1gXgkwViaTfb5nvfW4vy3OaZWNzGvR+XxhIJzFNynli7O fgLSNXbceuMT1/phHlxYuEXLzQfSE7l2PtUW58L4VzH4svHQVAGkIhvV2sWhOzrHYAlb 9GECEMbTf+PTagKa4SgJ9v0yWNUd5smmZVF71QCw74fs0E4Bc4RTgfsr3lAP4nQJiCEy 1a4A== X-Gm-Message-State: AOJu0YwyH5BbM844/C5t0U5GPgo+Ufbwzz9DBWcQO84UaORv7HG+xYFF aPthjPAQC/Ex4oNP3dIsm6Bc9dUVKjySEbSB3wfBsmR9q0Z20s5XZdkf9vDWnvTJ9v/0S1Tz+Jm 2PYRSfTWgddBTyfrX5/p0YSlebYbgrBESyBpfZMTfN0ecgpJKF7QmbNuFaunuhr9olHADEW2ds9 w= X-Received: by 2002:a17:907:1b0a:b0:9bf:10f3:e435 with SMTP id mp10-20020a1709071b0a00b009bf10f3e435mr3153500ejc.1.1697617693275; Wed, 18 Oct 2023 01:28:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGchnyx0RIse5pR/YExo1XrD5ZYoEMELwlhoB7/XU3808fhoOLyva9lwJBKo+gWmO5dz4Y+Ww== X-Received: by 2002:a17:907:1b0a:b0:9bf:10f3:e435 with SMTP id mp10-20020a1709071b0a00b009bf10f3e435mr3153488ejc.1.1697617692843; Wed, 18 Oct 2023 01:28:12 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id c8-20020a17090603c800b0098ec690e6d7sm1181297eja.73.2023.10.18.01.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 10/32] docs/sphinx: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:30 +0200 Message-ID: <20231018082752.322306-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- docs/sphinx/hxtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/hxtool.py b/docs/sphinx/hxtool.py index fb0649a3d5b..9f6b9d87dcc 100644 --- a/docs/sphinx/hxtool.py +++ b/docs/sphinx/hxtool.py @@ -49,7 +49,7 @@ def serror(file, lnum, errtext): def parse_directive(line): """Return first word of line, if any""" - return re.split('\W', line)[0] + return re.split(r'\W', line)[0] def parse_defheading(file, lnum, line): """Handle a DEFHEADING directive""" From patchwork Wed Oct 18 08:27:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=e5DqfJwc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PFD4KXYz20Pd for ; Wed, 18 Oct 2023 19:30:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uf-0001Dq-VA; Wed, 18 Oct 2023 04:28:22 -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 1qt1ue-00013w-7F for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:20 -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 1qt1uc-0003cX-NO for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kigZ1gdB5H+XjWPX4HIf/8kVEM1VbLJvt/chkAEw+1Y=; b=e5DqfJwcSw0XSWACgZC7ww1ft7GPzclFNsN5qMFevwqKdTzDHBU1KQYBPabZac7GJ4AOdb t9qRQ60XgWM2neRJWTfYlrfpqABxcQw08rofS7EFDsNbgbMoxQRHM2UtSWbdjgZdKCjhIs t1gpYQsj79Mkm/iGfAPI2xRZyUftDJg= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-_7rmjzOPNzCDiu5nK-yOkw-1; Wed, 18 Oct 2023 04:28:17 -0400 X-MC-Unique: _7rmjzOPNzCDiu5nK-yOkw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9b95fa56bd5so482905666b.0 for ; Wed, 18 Oct 2023 01:28:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617695; x=1698222495; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kigZ1gdB5H+XjWPX4HIf/8kVEM1VbLJvt/chkAEw+1Y=; b=IOL3k5crubvFiW14t7FxDHqs3E3GfZ55rWZ+H5XanW+wMwHDAAFfPueBmResCiHiUz g97RE5WaeqgP2T9kvqMS0Tw9vx7cTT5gzARNPkibHVEVhiGdZrcnci5/YqVIUajVbsQb NRnQhPLgYe3GPY/HcWINxt1gn98V7HK+WRNbHe4ODJO/R5WkdBT91YT3b4IfRx35RCgy /71FTlwiLFhIRpquaQZ1Cg0zcG+fbPM7jNZKeIsvRsFkAeGuB53aVQPs6WB+2ycuilGZ q7eb6Cr50uhvGAzIu4fydFKnYaWm4AOI3k5Wb1CxXPzg8Pg2yPRjG5y7qygW5RZOCuWl w8nw== X-Gm-Message-State: AOJu0YwcHMw/kj1jaE531/oJjQK0MDRILya2by7j/f978cNfq46aeNxX vzg/nKzZU1qRv5egNmG58Wh7d7k86yA8mYKQA8TbxVuxD+4WikjbWNUiBC9Wn7wrqrfr/AGY+Qo UtapVcPXFjp2LjS7b9o2zIinjQxyIZKlUB7vZRpHLacr632kig9Ko2MBof3iVwCqvIvIcQGlsZy w= X-Received: by 2002:a17:907:31ce:b0:9be:a86:571f with SMTP id xf14-20020a17090731ce00b009be0a86571fmr3149952ejb.34.1697617695237; Wed, 18 Oct 2023 01:28:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/4rcuERhN5GRkhtyWWw3nn32ToUNUxDahEkY261Z+1vicy+vlwzh8ACeP82cnGAe22ukNYA== X-Received: by 2002:a17:907:31ce:b0:9be:a86:571f with SMTP id xf14-20020a17090731ce00b009be0a86571fmr3149943ejb.34.1697617694914; Wed, 18 Oct 2023 01:28:14 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id f18-20020a170906739200b0099bc8bd9066sm1194780ejl.150.2023.10.18.01.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 11/32] target/hexagon: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:31 +0200 Message-ID: <20231018082752.322306-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/hexagon/hex_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index dce1b852a7b..0da65d6dd6a 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -45,7 +45,7 @@ def uniquify(seq): immre = re.compile(r"[#]([rRsSuUm])(\d+)(?:[:](\d+))?") reg_or_immre = re.compile( r"(((? X-Patchwork-Id: 1850605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DL/ExfJE; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PDJ07LJz20Pd for ; Wed, 18 Oct 2023 19:30:08 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uk-0001L6-4S; Wed, 18 Oct 2023 04:28:26 -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 1qt1uj-0001Iz-7b for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:25 -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 1qt1ug-0003dC-0I for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=USJ4B+GKahp2xXnvyxaH3LRoPVFr+Gu6HO/V82MTTnw=; b=DL/ExfJE80dptW68RTqS56Ih/yEzL3+42aLcJge+xqRH0VcCt1h4JKZvu6hzp6WVVg4elq ZFpYcOqhfziC2ktO61NxguoiGwAdC5XQpit0bFX5Ee3OBEv9II0Fro/aaJ0q0E0ogewDw5 G1Z1eMnX1PgMEVZRB33DggKdWQbcH5w= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-102-PGm-ylYKOLeo7E9E_w4Dvw-1; Wed, 18 Oct 2023 04:28:19 -0400 X-MC-Unique: PGm-ylYKOLeo7E9E_w4Dvw-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ae0601d689so435237866b.0 for ; Wed, 18 Oct 2023 01:28:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617698; x=1698222498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=USJ4B+GKahp2xXnvyxaH3LRoPVFr+Gu6HO/V82MTTnw=; b=HE6XQLKhoPLEr6I3eOEIyX7fdsVXSomyQ4vJQovL3GC9+RfckQg3ZtTimk4y0zwT8W XAQfVzgKZX/XczNVMI4o/9s56zB2HFZqCl2K60GdGzD6SNUKNWkoeZx4Q+aHJcMo1s+F a+13Mpperx5osg68Up/2pVV3EQ9jnSCLCUPYOYqSocx9zWrpUjhnh8W8FMC43Mue9POX 29y1CCG40yz3ciR/49fWnbnLPIXmunFW1S25LLdDpyBliZ/yS+swBfeyArTIhWal9Lr6 cBFJMdb/a2k8emypsLKrgGtLjiH1tC5UD5WuJjTxhySM7dLD5jMYZqkaK4swGJrmkHG8 sLIw== X-Gm-Message-State: AOJu0YwLT95JONUseKf48BOW3WOt9+sC2Qj20mvk9/SFIEUTbXk8YaOQ lT7cc/BaiQOG+Q246LhHkul5EFufNGuFFbM7nH54tK5C7RQqRciVWyWlqwoqXSFEDnoMzcjW2IG FRtw9MN6GbvkD4ZqeG+LlRlswWTgtjTnSbdV5CA0PH69mbUPRTPye8dkCiVx3A6c/VE1p/OiMYJ 4= X-Received: by 2002:a17:907:7f13:b0:9c2:2d0a:3211 with SMTP id qf19-20020a1709077f1300b009c22d0a3211mr3136392ejc.38.1697617698209; Wed, 18 Oct 2023 01:28:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/0ABVsM5dmPVQGYK1IHj1tX8EnJNyyUaiHmQc8hOrScecVq0lO4xG7DEbJArMbiC2FfkKeg== X-Received: by 2002:a17:907:7f13:b0:9c2:2d0a:3211 with SMTP id qf19-20020a1709077f1300b009c22d0a3211mr3136381ejc.38.1697617697916; Wed, 18 Oct 2023 01:28:17 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bh12-20020a170906a0cc00b0099bd7b26639sm1205444ejb.6.2023.10.18.01.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 12/32] tests/avocado: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:32 +0200 Message-ID: <20231018082752.322306-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- tests/avocado/virtio_check_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/virtio_check_params.py b/tests/avocado/virtio_check_params.py index f4314ef824f..5fe370a1793 100644 --- a/tests/avocado/virtio_check_params.py +++ b/tests/avocado/virtio_check_params.py @@ -43,7 +43,7 @@ class VirtioMaxSegSettingsCheck(QemuSystemTest): @staticmethod def make_pattern(props): - pattern_items = ['{0} = \w+'.format(prop) for prop in props] + pattern_items = [r'{0} = \w+'.format(prop) for prop in props] return '|'.join(pattern_items) def query_virtqueue(self, vm, dev_type_name): From patchwork Wed Oct 18 08:27:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ieFgjvYi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PCd0TW6z20Zj for ; Wed, 18 Oct 2023 19:29:32 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1up-0001gp-OS; Wed, 18 Oct 2023 04:28:31 -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 1qt1uo-0001f5-A1 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:30 -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 1qt1um-0003eP-Rx for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yLArINKdo6Ey6TFV8Luh6W8bJ4ZGOIGe53j+qUGkQVg=; b=ieFgjvYihUN6PaeRw6iEpTGFX1dx5CVL1xKkruIE+D/l7fioZLoO6uqPgrSr4JIoa/p/CW UVOHJjiumjgwaghWXkkwopSqbYjvK0GYU0gVVMbIXjFvZq8lCyT3o/QHc8nThH1Y6xp2TZ FsGc7lngBjVZ7XOAa5X/9uXTFz5Kk28= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-_yYRWlstNYiu6mK1B-xK7A-1; Wed, 18 Oct 2023 04:28:21 -0400 X-MC-Unique: _yYRWlstNYiu6mK1B-xK7A-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9be8013f2d1so292905766b.3 for ; Wed, 18 Oct 2023 01:28:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617700; x=1698222500; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yLArINKdo6Ey6TFV8Luh6W8bJ4ZGOIGe53j+qUGkQVg=; b=VBtEqMf8wH+C5UuYzDX+JushJYLzAsJNyw2Vw595lvkoM1xtGgrOGnT07yhF65uBCG G27ardjM27tE/Hemd5J842W3gBvcL89QK3hHEPgJj50F3fYhbhv/YFjDjS8F3ZzgcTbk 7xIciGb5nUpHnzhbJSSWJxKpkE9WAiIo1nzdTiN6vfjCgDu/OxMpDA/MpLBMbQY3g7N4 HfKydXg2GdOC5UxqYKrCxjLmhQbUuskLaW5LxyTw+uK6YcHg7bMLmHbF+XrapiLf4YG/ xN+k9/JjutWdonJTvI6TLaX9GFjz1Xz5pdJQs2sPfEYvqZmZvkRoBV/FEIVtdxOMLd4L lHIw== X-Gm-Message-State: AOJu0Yz4JCQGPPOgr5trVKA1iB0+Wanmctdw+cLe3+tWY67XxcAkjyVM mLgIWr0mek9hORaPz714EGcSeM7hwcqAzhNzKISl13I9wgKfv9VF2v/RJ3Qxq2jBzVP6bXUgTmN iy77FmEdEHCFDpYxEnmgLcqoryxcrtrGsEoGop0BEEaDRspXtg4GkExjkIijh3oe5Ki3dBc0T/8 w= X-Received: by 2002:a17:907:7b81:b0:9be:9d5f:6967 with SMTP id ne1-20020a1709077b8100b009be9d5f6967mr3454164ejc.69.1697617700207; Wed, 18 Oct 2023 01:28:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9HjFisCyhljM+i6ujaAanuuLkm4DcJSLab9W1NHEh4oioiHcaV2yCuj8Y42oFYbyUSmNuPA== X-Received: by 2002:a17:907:7b81:b0:9be:9d5f:6967 with SMTP id ne1-20020a1709077b8100b009be9d5f6967mr3454149ejc.69.1697617699769; Wed, 18 Oct 2023 01:28:19 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id mm27-20020a170906cc5b00b009929ab17be0sm1178768ejb.162.2023.10.18.01.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 13/32] tests/vm: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:33 +0200 Message-ID: <20231018082752.322306-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal or by double-escaping the backslash. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- tests/vm/basevm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 8aef4cff967..61725b83254 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -331,8 +331,8 @@ def console_init(self, timeout = None): def console_log(self, text): for line in re.split("[\r\n]", text): # filter out terminal escape sequences - line = re.sub("\x1b\[[0-9;?]*[a-zA-Z]", "", line) - line = re.sub("\x1b\([0-9;?]*[a-zA-Z]", "", line) + line = re.sub("\x1b\\[[0-9;?]*[a-zA-Z]", "", line) + line = re.sub("\x1b\\([0-9;?]*[a-zA-Z]", "", line) # replace unprintable chars line = re.sub("\x1b", "", line) line = re.sub("[\x00-\x1f]", ".", line) @@ -530,7 +530,7 @@ def get_qemu_version(qemu_path): and return the major number.""" output = subprocess.check_output([qemu_path, '--version']) version_line = output.decode("utf-8") - version_num = re.split(' |\(', version_line)[3].split('.')[0] + version_num = re.split(r' |\(', version_line)[3].split('.')[0] return int(version_num) def parse_config(config, args): From patchwork Wed Oct 18 08:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JObXcLtr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PLP6qvvz1ypX for ; Wed, 18 Oct 2023 19:35:25 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1us-0001j3-5n; Wed, 18 Oct 2023 04:28:34 -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 1qt1uq-0001hA-3u for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:32 -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 1qt1uo-0003fH-Mv for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yQHSU18s/IxqMTzYLPyCVp4HqDLtdKCCysne3i19W6E=; b=JObXcLtrJ2FQv9v9KIcQ4+VmPd1pi7go/yShDVUTRGmvV/qkTh05PlHTuZKs1QOFKcgNcV gYSFVb3u7QkMnAe0IYKYdHoQ1ntdq2cntafUIfI4CbIwCYVJAEb+OrD6MZvEb7HA9tUdLB R4EKJ4nhclFjkwwhjVJ73XaK/TLWe2s= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-DdmJXRMaMveGS8dVUIRwvA-1; Wed, 18 Oct 2023 04:28:23 -0400 X-MC-Unique: DdmJXRMaMveGS8dVUIRwvA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso486644266b.0 for ; Wed, 18 Oct 2023 01:28:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617702; x=1698222502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yQHSU18s/IxqMTzYLPyCVp4HqDLtdKCCysne3i19W6E=; b=k/KanJLNDXxpCKHpdFr9feQGLQmtY1qBq2r3ur0cH8utG1MB8OTvSyNvVgScPho4Ap YFZTVoozkCmpD7pyW/BJPNJkzITiSbD4MgfE6hIb/VerfxQz48S+Dc/+3YvXKuu3F9DJ YiMIk9nVDaHYxX/X1Y2siIK2nGd7plXAIVAOeYXnAfZcSiAl5wlq7YyFCuuNmDoBOJ8d AqrZKoX3tnQvywRpcSjZm0fUEpzyaJ2997wZ36kQTgY2K0zHB+lxB97eT9thjw5Egl4j j+X/+mUJuIuWcbirggF+MZTuSEhQR5FSf8uf8qdK0k+OMpe0Z2UP1Tr8wdBy/pCmEeth eUsw== X-Gm-Message-State: AOJu0YyHP07sknyQQTW3MOjjX4id59hBROfcLI8eYm5mFVE1mlgi4xMJ /OnakQc5q3d0FuiKUOtYBbyQ6nMByLEk73ZqFZl8ghoJDN+nYOawBYzgQfns09sNeEvdu9xbYGT IVta4k7CaNaqMs6S85EsKsGwGqIYURV9B3B3tSpWyAZNRp2owoGqb4hlccI2wJxNUJW0Vf6/pQr I= X-Received: by 2002:a17:907:86a0:b0:9bf:b8f7:1fcd with SMTP id qa32-20020a17090786a000b009bfb8f71fcdmr3524392ejc.14.1697617701910; Wed, 18 Oct 2023 01:28:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0lf9a+BRjfCPbWapa/dBB+iPPwAgqm+9DCKnWltvacJxXrcqeUozYeQfg4Yejq6RKi/w8Uw== X-Received: by 2002:a17:907:86a0:b0:9bf:b8f7:1fcd with SMTP id qa32-20020a17090786a000b009bfb8f71fcdmr3524383ejc.14.1697617701587; Wed, 18 Oct 2023 01:28:21 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id n27-20020a1709062bdb00b009829d2e892csm1216818ejg.15.2023.10.18.01.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 14/32] tracetool: avoid invalid escape in Python string Date: Wed, 18 Oct 2023 10:27:34 +0200 Message-ID: <20231018082752.322306-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is an error in Python 3.12; fix it by using a raw string literal. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- scripts/tracetool/__init__.py | 14 +++++++------- scripts/tracetool/format/log_stap.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 33cf85e2b04..b29594d75e0 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -210,12 +210,12 @@ class Event(object): """ - _CRE = re.compile("((?P[\w\s]+)\s+)?" - "(?P\w+)" - "\((?P[^)]*)\)" - "\s*" - "(?:(?:(?P\".+),)?\s*(?P\".+))?" - "\s*") + _CRE = re.compile(r"((?P[\w\s]+)\s+)?" + r"(?P\w+)" + r"\((?P[^)]*)\)" + r"\s*" + r"(?:(?:(?P\".+),)?\s*(?P\".+))?" + r"\s*") _VALID_PROPS = set(["disable", "vcpu"]) @@ -326,7 +326,7 @@ def __repr__(self): fmt) # Star matching on PRI is dangerous as one might have multiple # arguments with that format, hence the non-greedy version of it. - _FMT = re.compile("(%[\d\.]*\w+|%.*?PRI\S+)") + _FMT = re.compile(r"(%[\d\.]*\w+|%.*?PRI\S+)") def formats(self): """List conversion specifiers in the argument print format string.""" diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py index 0b6549d534a..b49afababd6 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -83,7 +83,7 @@ def c_fmt_to_stap(fmt): # and "%ll" is not valid at all. Similarly the size_t # based "%z" size qualifier is not valid. We just # strip all size qualifiers for sanity. - fmt = re.sub("%(\d*)(l+|z)(x|u|d)", "%\\1\\3", "".join(bits)) + fmt = re.sub(r"%(\d*)(l+|z)(x|u|d)", r"%\1\3", "".join(bits)) return fmt def generate(events, backend, group): From patchwork Wed Oct 18 08:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850617 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CqUgq/LK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PH32D9Yz20Pd for ; Wed, 18 Oct 2023 19:32:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1ut-0001mj-Va; Wed, 18 Oct 2023 04:28:36 -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 1qt1us-0001j4-1X for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:34 -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 1qt1uq-0003fe-H7 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=29Ov8K/gYI0tJ8cKPsPFpE4e3fFN2LTJq11ro7n66R0=; b=CqUgq/LK37As4pn3iXjgs+zzZ4lYyUuqcIubhfpNSQfBzroORBdHfqyyE2wkMFIs+ZY9HM 5HRtnCvcq2yPVl9g9B3M2SkV1r5Qs6wLq+6t4vYJ2xOAJjLoKGoozC1xASZadhPIlzDHDD vIWavqSiIR1OLoCo7TZ2j/RITJlj2JI= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-pkG5ozg-OnO6vIb2XYqEOQ-1; Wed, 18 Oct 2023 04:28:25 -0400 X-MC-Unique: pkG5ozg-OnO6vIb2XYqEOQ-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ae0bf9c0a9so433763666b.3 for ; Wed, 18 Oct 2023 01:28:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617704; x=1698222504; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=29Ov8K/gYI0tJ8cKPsPFpE4e3fFN2LTJq11ro7n66R0=; b=d9znB0dtR7xH+q76JPIGgzxfTAYHdM/oXK2vQd2+iT8voazM+kp/aPdWguir5q5WYE lGC3qNoU38JwcIbqC5wI0zHCjdB2uqRTezIAVl7Rh8tTBTHmZpTPMMPLl1I5vcnJFfMy thxp6nd8KfQMcecmdywxrCgZZu+wRYooOAO4uPGTyl1wplk06HNBUPgeGFx147R98C+p ++4+9aH0pZsyNudzWG17QyXioTbdtaE+U6y3WwRDtwlzQVwmrME2gKoy61fQnuXLs9wn yHYV1CrLSH25lLVYP0Pmd8Gr3X/YOQYPoSx7VTZlim03iOfYzijD+Fc7dwpTMQGec/5m m4hw== X-Gm-Message-State: AOJu0YzRFSQPtYbr+RkeEBt1TgFhuV9NuOWEwjIkwRzNKVS28WojkdFi mw8cXBGZ9+tHqFbhZEiYKSOEAF5hjR05TDtr8cDs95JkYWUnYrbRB+X54UsgcjxRnHpx+1IkmbJ +EjEm/eSutSZ6vI0SU1kdUf5YPs4RWWl3pXDCV1e+4qt9Q14At5PZAkKUh04utNRQaPoaz7FVZr c= X-Received: by 2002:a17:907:1ca0:b0:9c1:9b3a:4cd1 with SMTP id nb32-20020a1709071ca000b009c19b3a4cd1mr3230070ejc.3.1697617704056; Wed, 18 Oct 2023 01:28:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4rVpWD5io6uLOuKfdJ1CjruM9Xh3u/6Rt8G5OS+gmAVMW68gWT+1IlQBtwrBVXSvdB0S6cw== X-Received: by 2002:a17:907:1ca0:b0:9c1:9b3a:4cd1 with SMTP id nb32-20020a1709071ca000b009c19b3a4cd1mr3230057ejc.3.1697617703816; Wed, 18 Oct 2023 01:28:23 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bo16-20020a170906d05000b00977eec7b7e8sm1195760ejb.68.2023.10.18.01.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Emmanouil Pitsidianakis Subject: [PULL 15/32] meson: do not build shaders by default Date: Wed, 18 Oct 2023 10:27:35 +0200 Message-ID: <20231018082752.322306-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org They are not needed when building user-mode emulators. Reviewed-by: Emmanouil Pitsidianakis Signed-off-by: Paolo Bonzini --- ui/shader/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/shader/meson.build b/ui/shader/meson.build index 592bf596b9a..3137e65578e 100644 --- a/ui/shader/meson.build +++ b/ui/shader/meson.build @@ -10,5 +10,6 @@ foreach e : shaders output: output, capture: true, input: files('@0@.@1@'.format(e[0], e[1])), + build_by_default: false, command: [shaderinclude, '@INPUT0@']) endforeach From patchwork Wed Oct 18 08:27:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PSs565E5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PD94s5fz20Zj for ; Wed, 18 Oct 2023 19:30:01 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1ut-0001lL-34; Wed, 18 Oct 2023 04:28:35 -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 1qt1up-0001gX-A0 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:31 -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 1qt1un-0003eb-IY for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617709; 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=25xnsEqSHxpQ4CTPcOTT4GIh5JKkdRZwjXwxTddW8Dk=; b=PSs565E5OxeTxfGXtJgLeIExF3Vi28ZwvFwaO1dC95ga0TtCXiIY2hSzh8sYmYUhVc6O0r FWa5pQ3N4v8+Xn/xcNRBDmGAbj9vz+zmONhFWsauQu2qfoPxuduTSAfbier+1AYoUbOyRh vr8higgrA8l/KMzrBiqVT0T4FBoNM6A= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-448-Pi68u2BjPwG309KdPyGJKQ-1; Wed, 18 Oct 2023 04:28:26 -0400 X-MC-Unique: Pi68u2BjPwG309KdPyGJKQ-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-53e119e615aso7186034a12.0 for ; Wed, 18 Oct 2023 01:28:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617705; x=1698222505; 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=25xnsEqSHxpQ4CTPcOTT4GIh5JKkdRZwjXwxTddW8Dk=; b=IhzIkUj36esShXcaql8SdQl1oRH8cIThUHK1lJLh62Lf2pRhyxZ3y2CWyeSSO2er4t 7bIadt/19as4Y9bhvtwuAm0vgjUBnQ03oNVXm+Q31DAFh3IO5Ng4V8XoJHQb5fC3iEtd N0C7Mvqx169RA3Pw143HAJOcsEmdvGqZZt6R4JHQYZUlfghjxDOgQpJWjOEI8eiKnJJ1 yFHHov94GarGYhoXiUJ0LrgKSN0/VWMijAvG8c/QDyBGoXZaDCWoKvKbMhtgiU9Ko4Me LGJq9flCyt5krIRnuxyGZu0JXkdipsjw8g5mhfnJGtnR1dYQZuyeEzn/BnsQhIaVtmYe C0Kw== X-Gm-Message-State: AOJu0YwwxYuHUlQ+xZO7wvIAvcV/ZrFCOux/+us7HngjlpB6qc98XEbc ZPCfZwV75Zez7b8VDAZ9SVWSs6IF3gKJNI/a3Dpqn+EzEskX+xfyBLiaLUIk1zqY/ydM3efjuZr josrVosIUwEV+4vCDYzTsZyqVyNq+M1dJjCdkMmcUgj96mi9wtgw2+jWvW5nZwq37Pv1GViutRn g= X-Received: by 2002:a50:cc4a:0:b0:530:8942:e830 with SMTP id n10-20020a50cc4a000000b005308942e830mr3866265edi.2.1697617705426; Wed, 18 Oct 2023 01:28:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMnk2aoiGtvXDTWxPx40051Zd3JOqUPvP8xQV1GRonrQhtFxrPXtHnITs5fKjLURAVVT7fbQ== X-Received: by 2002:a50:cc4a:0:b0:530:8942:e830 with SMTP id n10-20020a50cc4a000000b005308942e830mr3866249edi.2.1697617705039; Wed, 18 Oct 2023 01:28:25 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bx18-20020a0564020b5200b0053d9cb67248sm2380498edb.18.2023.10.18.01.28.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/32] meson: do not use set10 Date: Wed, 18 Oct 2023 10:27:36 +0200 Message-ID: <20231018082752.322306-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make all items of config-host.h consistent. To keep the --disable-coroutine-pool code visible to the compiler, mutuate the IS_ENABLED() macro from Linux. Signed-off-by: Paolo Bonzini --- include/qemu/compiler.h | 15 +++++++++++++++ meson.build | 2 +- tests/unit/test-coroutine.c | 2 +- util/qemu-coroutine.c | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 1109482a000..c797f0d4572 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -212,4 +212,19 @@ # define QEMU_USED #endif +/* + * Ugly CPP trick that is like "defined FOO", but also works in C + * code. Useful to replace #ifdef with "if" statements; assumes + * the symbol was defined with Meson's "config.set()", so it is empty + * if defined. + */ +#define IS_ENABLED(x) IS_EMPTY(x) + +#define IS_EMPTY_JUNK_ junk, +#define IS_EMPTY(value) IS_EMPTY_(IS_EMPTY_JUNK_##value) + +/* Expands to either SECOND_ARG(junk, 1, 0) or SECOND_ARG(IS_EMPTY_JUNK_CONFIG_FOO 1, 0) */ +#define SECOND_ARG(first, second, ...) second +#define IS_EMPTY_(junk_maybecomma) SECOND_ARG(junk_maybecomma 1, 0) + #endif /* COMPILER_H */ diff --git a/meson.build b/meson.build index bd65a111aa8..010d2c649c2 100644 --- a/meson.build +++ b/meson.build @@ -2194,7 +2194,7 @@ if get_option('debug_stack_usage') and have_coroutine_pool message('Disabling coroutine pool to measure stack usage') have_coroutine_pool = false endif -config_host_data.set10('CONFIG_COROUTINE_POOL', have_coroutine_pool) +config_host_data.set('CONFIG_COROUTINE_POOL', have_coroutine_pool) config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lock')) config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex')) config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_usage')) diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c index b0d21d673a0..a2563647e74 100644 --- a/tests/unit/test-coroutine.c +++ b/tests/unit/test-coroutine.c @@ -645,7 +645,7 @@ int main(int argc, char **argv) * with a sentinel value. If there is no freelist this would legitimately * crash, so skip it. */ - if (CONFIG_COROUTINE_POOL) { + if (IS_ENABLED(CONFIG_COROUTINE_POOL)) { g_test_add_func("/basic/no-dangling-access", test_no_dangling_access); } diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index 17a88f65053..5fd2dbaf8bb 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -57,7 +57,7 @@ Coroutine *qemu_coroutine_create(CoroutineEntry *entry, void *opaque) { Coroutine *co = NULL; - if (CONFIG_COROUTINE_POOL) { + if (IS_ENABLED(CONFIG_COROUTINE_POOL)) { CoroutineQSList *alloc_pool = get_ptr_alloc_pool(); co = QSLIST_FIRST(alloc_pool); @@ -99,7 +99,7 @@ static void coroutine_delete(Coroutine *co) { co->caller = NULL; - if (CONFIG_COROUTINE_POOL) { + if (IS_ENABLED(CONFIG_COROUTINE_POOL)) { if (release_pool_size < qatomic_read(&pool_max_size) * 2) { QSLIST_INSERT_HEAD_ATOMIC(&release_pool, co, pool_next); qatomic_inc(&release_pool_size); From patchwork Wed Oct 18 08:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TkfDfca0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PLS47L4z1ypX for ; Wed, 18 Oct 2023 19:35:28 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1us-0001j0-6F; Wed, 18 Oct 2023 04:28:34 -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 1qt1uq-0001hz-Oz for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:32 -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 1qt1uo-0003fK-Nu for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ci9nsDPUBmPgirpk9Ch50MqJqivmpk1eKdp5QoVu9I4=; b=TkfDfca0C8OivJABF4TLCHtwJQfOt6ELvANRqCildSg204j+6at4wIdhcbrilpxBm/RNjU EOLsZWwTRoY5P3lU34QrwCa5no8efWdmhfNc23L2eD4aOMRjAqbxsk6jzVWEg0j9U0pKN8 uNL6Sfp0WGDcO0h8mP6E5I/ymXAkdig= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-iwJA5iYdPpqQrTSRwFACLg-1; Wed, 18 Oct 2023 04:28:28 -0400 X-MC-Unique: iwJA5iYdPpqQrTSRwFACLg-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9c15543088aso375996166b.1 for ; Wed, 18 Oct 2023 01:28:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617707; x=1698222507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ci9nsDPUBmPgirpk9Ch50MqJqivmpk1eKdp5QoVu9I4=; b=QqkolZL5A7uxhxOQSoRiYlD4CnS3uhgeeySC3CgEI5oEihd0/kQ2TLaVmbK6lk1wYN N8w/JbQ1KftDE/u7cg99gx7kJc1/0fhvPmPkKBG7crfr1BUIC/9gpgzGIsyh+Drwl5pH rXrRKaCPbnVyXj+jq8+hCPiGNeKfhFm6b92rEQOo4+vHNJ66SdGWml1UHTSQWXj1ou72 jVodTuotRZ+atFSRrilVbA6m1HXKLIMgzYF0nUMF9jIWPEE9mqDklXAd9dUMu9ZSMScm jICsl9Zy8X6TXMc/qr+VhoU0ZDYuaZwzWoieluwPpH+ERrwkH/FdMDFMwVS2juFeDlZS Xf8g== X-Gm-Message-State: AOJu0YyFagQcjD9FkTFdFrUmYqiTNWc3e0VJCYV0dEM3CgknJV1OUEHT RuByOq/LEZB+sKPaLVlRoiXb7JwKAqA4+61fLz7efJ2t0tmVZp14Ly5iFr0CK3SrYFgCxhXMeIO Jr2d0jRzJYMYXbeg60f1lURgjLzkm7k/MOhy4lCB7UBHv3RSJ7PckgMqs31QWWx6PEWVByciGCa I= X-Received: by 2002:a17:907:9724:b0:9ae:5513:e475 with SMTP id jg36-20020a170907972400b009ae5513e475mr4443260ejc.9.1697617706923; Wed, 18 Oct 2023 01:28:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFT+FzaNfapp9aQuNESx8flvtpjYVEFaoGZqGNzYS7X+2RcFpwDi5WBSmXjPdi3Rx2Ae6PmMg== X-Received: by 2002:a17:907:9724:b0:9ae:5513:e475 with SMTP id jg36-20020a170907972400b009ae5513e475mr4443241ejc.9.1697617706588; Wed, 18 Oct 2023 01:28:26 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id mc8-20020a170906eb4800b009737b8d47b6sm1138613ejb.203.2023.10.18.01.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Michael Tokarev , Emmanouil Pitsidianakis Subject: [PULL 17/32] meson, cutils: allow non-relocatable installs Date: Wed, 18 Oct 2023 10:27:37 +0200 Message-ID: <20231018082752.322306-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Say QEMU is configured with bindir = "/usr/bin" and a firmware path that starts with "/usr/share/qemu". Ever since QEMU 5.2, QEMU's install has been relocatable: if you move qemu-system-x86_64 from /usr/bin to /home/username/bin, it will start looking for firmware in /home/username/share/qemu. Previously, you would get a non-relocatable install where the moved QEMU will keep looking for firmware in /usr/share/qemu. Windows almost always wants relocatable installs, and in fact that is why QEMU 5.2 introduced relocatability in the first place. However, newfangled distribution mechanisms such as AppImage (https://docs.appimage.org/reference/best-practices.html), and possibly NixOS, also dislike using at runtime the absolute paths that were established at build time. On POSIX systems you almost never care; if you do, your usecase dictates which one is desirable, so there's no single answer. Obviously relocatability works fine most of the time, because not many people have complained about QEMU's switch to relocatable install, and that's why until now there was no way to disable relocatability. But a non-relocatable, non-modular binary can help if you want to do experiments with old firmware and new QEMU or vice versa (because you can just upgrade/downgrade the firmware package, and use rpm2cpio or similar to extract the QEMU binaries outside /usr), so allow both. This patch allows one to build a non-relocatable install using a new option to configure. Why? Because it's not too hard, and because it helps the user double check the relocatability of their install. Note that the same code that handles relocation also lets you run QEMU from the build tree and pick e.g. firmware files from the source tree transparently. Therefore that part remains active with this patch, even if you configure with --disable-relocatable. Suggested-by: Michael Tokarev Reviewed-by: Emmanouil Pitsidianakis Signed-off-by: Paolo Bonzini --- meson.build | 20 ++++++++++++++++++++ meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ util/cutils.c | 11 ++++++++--- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 010d2c649c2..1be9f92f7da 100644 --- a/meson.build +++ b/meson.build @@ -2111,6 +2111,7 @@ config_host_data.set('CONFIG_OPENGL', opengl.found()) config_host_data.set('CONFIG_PLUGIN', get_option('plugins')) config_host_data.set('CONFIG_RBD', rbd.found()) config_host_data.set('CONFIG_RDMA', rdma.found()) +config_host_data.set('CONFIG_RELOCATABLE', get_option('relocatable')) config_host_data.set('CONFIG_SAFESTACK', get_option('safe_stack')) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) @@ -4054,6 +4055,7 @@ if 'simple' in get_option('trace_backends') endif summary_info += {'D-Bus display': dbus_display} summary_info += {'QOM debugging': get_option('qom_cast_debug')} +summary_info += {'Relocatable install': get_option('relocatable')} summary_info += {'vhost-kernel support': have_vhost_kernel} summary_info += {'vhost-net support': have_vhost_net} summary_info += {'vhost-user support': have_vhost_user} @@ -4356,3 +4358,21 @@ if host_arch == 'unknown' or not supported_oses.contains(targetos) message('If you want to help supporting QEMU on this platform, please') message('contact the developers at qemu-devel@nongnu.org.') endif + +actually_reloc = get_option('relocatable') +# check if get_relocated_path() is actually able to relocate paths +if get_option('relocatable') and \ + not (get_option('prefix') / get_option('bindir')).startswith(get_option('prefix') / '') + message() + warning('bindir not included within prefix, the installation will not be relocatable.') + actually_reloc = false +endif +if not actually_reloc and (targetos == 'windows' or get_option('relocatable')) + if targetos == 'windows' + message() + warning('Windows installs should usually be relocatable.') + endif + message() + message('QEMU will have to be installed under ' + get_option('prefix') + '.') + message('Use --disable-relocatable to remove this warning.') +endif diff --git a/meson_options.txt b/meson_options.txt index 6a17b909680..e237b268469 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -101,6 +101,8 @@ option('cfi_debug', type: 'boolean', value: false, description: 'Verbose errors in case of CFI violation') option('multiprocess', type: 'feature', value: 'auto', description: 'Out of process device emulation support') +option('relocatable', type : 'boolean', value : 'true', + description: 'toggle relocatable install') option('vfio_user_server', type: 'feature', value: 'disabled', description: 'vfio-user server support') option('dbus_display', type: 'feature', value: 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 2a74b0275b3..d4b89e6b443 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -17,6 +17,7 @@ meson_options_help() { printf "%s\n" ' code for the Hexagon frontend' printf "%s\n" ' --disable-install-blobs install provided firmware blobs' printf "%s\n" ' --disable-qom-cast-debug cast debugging support' + printf "%s\n" ' --disable-relocatable toggle relocatable install' printf "%s\n" ' --docdir=VALUE Base directory for documentation installation' printf "%s\n" ' (can be empty) [share/doc]' printf "%s\n" ' --enable-block-drv-whitelist-in-tools' @@ -421,6 +422,8 @@ _meson_option_parse() { --disable-rbd) printf "%s" -Drbd=disabled ;; --enable-rdma) printf "%s" -Drdma=enabled ;; --disable-rdma) printf "%s" -Drdma=disabled ;; + --enable-relocatable) printf "%s" -Drelocatable=true ;; + --disable-relocatable) printf "%s" -Drelocatable=false ;; --enable-replication) printf "%s" -Dreplication=enabled ;; --disable-replication) printf "%s" -Dreplication=disabled ;; --enable-rng-none) printf "%s" -Drng_none=true ;; diff --git a/util/cutils.c b/util/cutils.c index c99d26c5e2d..64f817b477b 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -1178,9 +1178,11 @@ char *get_relocated_path(const char *dir) #else g_string_append(result, dir); #endif - } else if (!starts_with_prefix(dir) || !starts_with_prefix(bindir)) { - g_string_assign(result, dir); - } else { + goto out; + } + + if (IS_ENABLED(CONFIG_RELOCATABLE) && + starts_with_prefix(dir) && starts_with_prefix(bindir)) { g_string_assign(result, exec_dir); /* Advance over common components. */ @@ -1203,7 +1205,10 @@ char *get_relocated_path(const char *dir) assert(G_IS_DIR_SEPARATOR(dir[-1])); g_string_append(result, dir - 1); } + goto out; } + g_string_assign(result, dir); +out: return g_string_free(result, false); } From patchwork Wed Oct 18 08:27:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A1npGn3n; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PCZ3d6Rz20Zj for ; Wed, 18 Oct 2023 19:29:30 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1v7-0001vV-Jf; Wed, 18 Oct 2023 04:28:49 -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 1qt1v1-0001ta-Uy for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:44 -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 1qt1v0-0003h5-FV for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jt5quYMWBBvksWop+adbyL29xvQPeeLJ8DpSrfg08L4=; b=A1npGn3neGKINlP5y/TA5gm8C5EwqX13B/EVATC6JopHXVYThr0gbANS53DYgo+t3Wodg3 BLeDWY19Naw192aa8trIyN9SqbKIxKUtK/lXio46PfZPWVXXj9xo8y5crARkthawWi9Ar6 gzy5yroviARaVMjkZiftgv4U7LC609o= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-1PMZa2ZjOPi45aWuifbcEw-1; Wed, 18 Oct 2023 04:28:30 -0400 X-MC-Unique: 1PMZa2ZjOPi45aWuifbcEw-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9b95fa56bd5so482926866b.0 for ; Wed, 18 Oct 2023 01:28:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617709; x=1698222509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jt5quYMWBBvksWop+adbyL29xvQPeeLJ8DpSrfg08L4=; b=o7pBqE1uQ1O1FKizAVuBOIjhfhCNrqKA39b/y/D+PifEUoBDYqHbK8NA0bwOxsuxsN GfDw/UG4z8dBJU74Yjwu3NC4ykZ6wAk/+RXejM2I+AZ38E+rbk6MUjtTzC/ITpzUJI9+ uhNIvMZtMlrDHw9vB0SQ4QhZQbPrWyePLw0hNEWvdBIXAdQyqsO22OWKkBub/dsQWTE0 Djl9mh9760RIYYX1JxpRk//KKufJMlcaletz2F51bOIRwpRIVlRAVYXE8TwzX1ZhHw2f fNDnV7C32sUZs1toAUbs1LfEGlxj5B5qKbRghvY6bHLBKCUQfpTaMtswVzVwLGIoKTK1 9RSQ== X-Gm-Message-State: AOJu0Yw0+0fh0pQBYTMMwiYDZh3olbrTwdmkCSKcU3tJb+Wxzpwem+l4 maW0Et4kLtYSQXjWWCdYsa8Cmj6CXne129AFza67TWfrgPyb9Ipe7XQu12EH0cgb1vVe7lk4hEH F+DzDvu+LG+7Ldp+LvqiHmPTlNeuAo5az6WQfC7KI/EKDhvzLse90m58if2fkk6P1rOOhEXUtKo E= X-Received: by 2002:a17:906:4fc7:b0:9bf:77ae:3aa9 with SMTP id i7-20020a1709064fc700b009bf77ae3aa9mr3372995ejw.24.1697617708835; Wed, 18 Oct 2023 01:28:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7AtoMUw3C7lAHwJoSZNdSOYsuP4/g0DITA63o/LU5whGUiVWBxpAVnqwj5xXpVOU/ddcM5w== X-Received: by 2002:a17:906:4fc7:b0:9bf:77ae:3aa9 with SMTP id i7-20020a1709064fc700b009bf77ae3aa9mr3372981ejw.24.1697617708432; Wed, 18 Oct 2023 01:28:28 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id j26-20020a170906255a00b009c503bf61c9sm1162352ejb.165.2023.10.18.01.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 18/32] configure: clean up handling of CFI option Date: Wed, 18 Oct 2023 10:27:38 +0200 Message-ID: <20231018082752.322306-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Avoid that --enable-cfi --disable-cfi leaves b_lto set to true. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- configure | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configure b/configure index d6103a0141f..9f782054509 100755 --- a/configure +++ b/configure @@ -625,7 +625,10 @@ meson_option_build_array() { meson_options= meson_option_add() { - meson_options="$meson_options $(quote_sh "$1")" + local arg + for arg; do + meson_options="$meson_options $(quote_sh "$arg")" + done } meson_option_parse() { meson_options="$meson_options $(_meson_option_parse "$@")" @@ -767,11 +770,9 @@ for opt do ;; --disable-werror) werror="no" ;; - --enable-cfi) - cfi="true"; - meson_option_add -Db_lto=true + --enable-cfi) cfi=true ;; - --disable-cfi) cfi="false" + --disable-cfi) cfi=false ;; --disable-download) download="disabled"; git_submodules_action=validate; ;; @@ -1845,7 +1846,7 @@ if test "$skip_meson" = no; then test "$werror" = yes && meson_option_add -Dwerror=true # QEMU options - test "$cfi" != false && meson_option_add "-Dcfi=$cfi" + test "$cfi" != false && meson_option_add "-Dcfi=$cfi" "-Db_lto=$cfi" test "$docs" != auto && meson_option_add "-Ddocs=$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test "$plugins" = yes && meson_option_add "-Dplugins=true" From patchwork Wed Oct 18 08:27:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XLk59ahu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PGf1HtRz20Pd for ; Wed, 18 Oct 2023 19:32:10 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uv-0001nj-Og; Wed, 18 Oct 2023 04:28:37 -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 1qt1uu-0001n2-1m for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:36 -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 1qt1us-0003fv-Ft for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617714; 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=gMEGfJX5yEubPkar1DYtNMZdMeXfWKJZ/edTNcXbgHQ=; b=XLk59ahugnxF8gPZahmNlBJyWU/Xk+NzvxJJmC6XbXT66o4wwEKLbWyIE24n6sXU8IWAST ez2ngGLDn2IjubvPzF75PEMdD+bNjUhFpMpo0O66ulOuxpGlw4cGpPg7DIDYvczPtoudhI lcqgRI2YwDD+qQonwumV18OwRIei/Lc= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-i7Kr-3PjMPquvvFdTE1v5Q-1; Wed, 18 Oct 2023 04:28:32 -0400 X-MC-Unique: i7Kr-3PjMPquvvFdTE1v5Q-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9be8013f2d1so292916666b.3 for ; Wed, 18 Oct 2023 01:28:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617710; x=1698222510; 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=gMEGfJX5yEubPkar1DYtNMZdMeXfWKJZ/edTNcXbgHQ=; b=VYP88xiH1+AiYCYl6J8aQUF+uykXsTMQ4SMsE6Nz7lVYaFSuuxpU/fNBkOsNzXZlaH IuKqyMb1OXXnFt7efuid/5JED8031PiHa+7Rle56hvhrx2sITbE0c1RXzkxGqE2FPTVm ZfsaEaoALDvETsmn4q+bnAD4pA8HcZT3CUEYiOm4zXkDWKInYfYxK82MD7yP2mEqABbu sG2gwTeoA3G35dWxVGPmTWNe2uS9xzXh05B1t+2zgxVSb0i7PpqJ4LB/jb8kMPnGsYwj 9LeeP0uA3Wrq2w7Cd8S+hLBQE3OVvXW1GBcX7CfCnLJSJXXY408oayE/pEwW57p+NxRK MvxQ== X-Gm-Message-State: AOJu0YxChfzXLbSy0SANvpIYTufWJ54htNxgZwuDtp9xGO9wO7FGGDtd E35b8FmOlD2VaMkKzGEwSIKQcTTyzhAF5CgBdI/I1I1HfiOSWDFHXatWTHPEd4W4tP+bqx7jbGE pDQpdGhlEXbDHofI3m33h/c1QiK5z9ffKujjjJGpur5rWAIm4MyhY0ErN0Nu114Zw8Ah9fDHCxW M= X-Received: by 2002:a17:907:9348:b0:9ba:321b:80e1 with SMTP id bv8-20020a170907934800b009ba321b80e1mr3700628ejc.0.1697617710507; Wed, 18 Oct 2023 01:28:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgsvshjrABH1NowfhNzEL8PtltCeDBYjwcl4eouTaNWN43Sj+gfXmk77fkJW99XChCCL4gyQ== X-Received: by 2002:a17:907:9348:b0:9ba:321b:80e1 with SMTP id bv8-20020a170907934800b009ba321b80e1mr3700614ejc.0.1697617710215; Wed, 18 Oct 2023 01:28:30 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id ck3-20020a170906c44300b009bf7a4d591dsm1197143ejb.32.2023.10.18.01.28.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/32] hw/xen: cleanup sourcesets Date: Wed, 18 Oct 2023 10:27:39 +0200 Message-ID: <20231018082752.322306-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org xen_ss is added unconditionally to arm_ss and i386_ss (the only targets that can have CONFIG_XEN enabled) and its contents are gated by CONFIG_XEN; xen_specific_ss has no condition for its constituent files but is gated on CONFIG_XEN when its added to specific_ss. So xen_ss is a duplicate of xen_specific_ss, though defined in a different way. Merge the two by eliminating xen_ss. Signed-off-by: Paolo Bonzini --- hw/arm/meson.build | 1 - hw/i386/meson.build | 1 - hw/xen/meson.build | 11 ++++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 11eb9112f88..a6feaf1af95 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -64,7 +64,6 @@ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c')) -arm_ss.add_all(xen_ss) system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) diff --git a/hw/i386/meson.build b/hw/i386/meson.build index ff879069c98..369c6bf823b 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -32,6 +32,5 @@ subdir('kvm') subdir('xen') i386_ss.add_all(xenpv_ss) -i386_ss.add_all(xen_ss) hw_arch += {'i386': i386_ss} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 277f9f292b4..d887fa9ba43 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -12,6 +12,10 @@ system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( )) xen_specific_ss = ss.source_set() +xen_specific_ss.add(files( + 'xen-mapcache.c', + 'xen-hvm-common.c', +)) if have_xen_pci_passthrough xen_specific_ss.add(files( 'xen-host-pci-device.c', @@ -26,10 +30,3 @@ else endif specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) - -xen_ss = ss.source_set() - -xen_ss.add(when: 'CONFIG_XEN', if_true: files( - 'xen-mapcache.c', - 'xen-hvm-common.c', -)) From patchwork Wed Oct 18 08:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gEA1rVD3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PHv0QKZz20Pd for ; Wed, 18 Oct 2023 19:33:15 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1uy-0001qz-Hf; Wed, 18 Oct 2023 04:28:40 -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 1qt1uw-0001o8-AJ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:38 -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 1qt1uu-0003g8-Mz for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617715; 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=fxx0UVHYrb7uEEGRAehFsixsJ7Yl+etKGjOVzEvVFO0=; b=gEA1rVD3+ottRv9QTIMzUup3qCi8VRM/NiufjHDci5Ur3HI2w5+bre0QeFracThgnGlOcN vwMhyWA7VMNGe+HIdFc910SI5aVn/URn8x4SVG0MM91OC5pBGosgD1eQh2bWg+HMo2pTcG 85bxbAQ8VGWIrWeiAFNAZacIA7ere/o= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-277-X0EQ7mt6M2yG71_A3XnU6Q-1; Wed, 18 Oct 2023 04:28:33 -0400 X-MC-Unique: X0EQ7mt6M2yG71_A3XnU6Q-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-53dd901c9c3so5123199a12.0 for ; Wed, 18 Oct 2023 01:28:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617712; x=1698222512; 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=fxx0UVHYrb7uEEGRAehFsixsJ7Yl+etKGjOVzEvVFO0=; b=GSvqByryIkN81/j7eUJxF4QwqcEn2cwMZHmxeps62tzzJViydZeDt88S97elgioPKI 26GecfxFi1C7CjVN2CkyZObAS8G3ECECU6gERajj41w1ous3wvVwAG7YmdplBgFQEZvF xTdrlxw38b6GnGd50zfi5i+QFTY1e158xDg8x8THNtQRQDb3pYZILksgz87zZdXSQlqF TWrrzwu7uhQMXsuukrPYV0YGZ3vYuHjJY3IS+kNOSuF8KAEXyJGPuFYoUXSJHZISL5Ij FP4II8tWsZsNGh3YT4aNzaps5oOFwLKtEnNBLYQjoxPs5vywJgU5Nl4eBXjmNqGVxLBC DAhg== X-Gm-Message-State: AOJu0YzPbVtRWKDOFYl9gGLSIXGHXnyRdpmtlCj9d47hWKXwAdo6YHT4 PuuUVoIrPF2In+024PaF9H7HE5pyfKSNm4cV+fWsVoS0p29z/W1di/avO3bXHJvbdPfXtURfcFG f4+9DhTf/w0cXDlyyRmZgKDAjrtQ7nS+0q3+IutXdxXRnsLh7KOIX97a6TfpuQnaZt09IJPUiw3 A= X-Received: by 2002:a50:cd4b:0:b0:53e:34c5:fc14 with SMTP id d11-20020a50cd4b000000b0053e34c5fc14mr3390324edj.23.1697617711807; Wed, 18 Oct 2023 01:28:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwFljxnMZeJzAhAxtHs64AoCJlaJIDZmgt8BrtzVljHdhsEFjBicp3VA+1O4XIK0zCm5rkBg== X-Received: by 2002:a50:cd4b:0:b0:53e:34c5:fc14 with SMTP id d11-20020a50cd4b000000b0053e34c5fc14mr3390310edj.23.1697617711464; Wed, 18 Oct 2023 01:28:31 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id w23-20020a50fa97000000b0053e5edeff3bsm2346562edr.93.2023.10.18.01.28.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/32] hw/remote: move stub vfu_object_set_bus_irq out of stubs/ Date: Wed, 18 Oct 2023 10:27:40 +0200 Message-ID: <20231018082752.322306-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/remote/meson.build | 4 +++- stubs/vfio-user-obj.c => hw/remote/vfio-user-obj-stub.c | 0 stubs/meson.build | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) rename stubs/vfio-user-obj.c => hw/remote/vfio-user-obj-stub.c (100%) diff --git a/hw/remote/meson.build b/hw/remote/meson.build index a1e8708c732..a3aa29aaf17 100644 --- a/hw/remote/meson.build +++ b/hw/remote/meson.build @@ -7,9 +7,11 @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c')) remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c')) remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iohub.c')) remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iommu.c')) -remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: files('vfio-user-obj.c')) remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: libvfio_user_dep) +remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: files('vfio-user-obj.c'), + if_false: files('vfio-user-obj-stub.c')) +remote_ss.add(when: 'CONFIG_ALL', if_true: files('vfio-user-obj-stub.c')) specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c')) specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c')) diff --git a/stubs/vfio-user-obj.c b/hw/remote/vfio-user-obj-stub.c similarity index 100% rename from stubs/vfio-user-obj.c rename to hw/remote/vfio-user-obj-stub.c diff --git a/stubs/meson.build b/stubs/meson.build index cde44972bf8..0bf25e6ca53 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -65,4 +65,3 @@ else stub_ss.add(files('qdev.c')) endif stub_ss.add(files('semihost-all.c')) -stub_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_false: files('vfio-user-obj.c')) From patchwork Wed Oct 18 08:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gvUM+JO0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PL56vGhz1ypX for ; Wed, 18 Oct 2023 19:35:09 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1v3-0001u5-Tw; Wed, 18 Oct 2023 04:28:47 -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 1qt1uw-0001oF-KY for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:39 -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 1qt1uv-0003gL-5S for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617716; 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=UWFwfKWsP26Bal1UGvJOrMRc81Ismgv98NyAMzklpAA=; b=gvUM+JO07/AHtFwE7ZpF8Sqx8+fhTXxA+GQn8FTtkqD8483tQOl2RNnVQDlkbGfL2bSpiz onGtgG6ZBLgg7wR3ifXY/63qk9+h+DJQkrgBicSd6Ncm2DG+5Vz0dayQWl16oay1fyI6ES xGG97FcH+4KPwMP+izB73R/Y5r2MsU0= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-bIedYtN_OxW8t1C3Z-87rA-1; Wed, 18 Oct 2023 04:28:34 -0400 X-MC-Unique: bIedYtN_OxW8t1C3Z-87rA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-997c891a88dso485404666b.3 for ; Wed, 18 Oct 2023 01:28:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617713; x=1698222513; 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=UWFwfKWsP26Bal1UGvJOrMRc81Ismgv98NyAMzklpAA=; b=PQiptOnADDfE2vwdI910tFrf7jSdkOdp3lu0kHQiVwphzAZ1VrxztJnZwMR/cM/TTB 90E/kQEsT6bG+ZmRbqxzdqejmzjK+l4sLbQT9RHlW93youXgthB/2FzQgC6tGJdDicAG qZ4rYr3t4BLaA7qFSyPfrh6cEC02vd4jD7QIoGaj+QGooqkWWpzEsN8G9iv3MLpnSfif efCsMHbNhY96R1gtqcknH6QL/FPKlljN/AeIHTMz6F2RNj9czSpAX1CMKvRmkxEfce/w QTa7VAC6Z5VBctQcQRWH8PbUKqQ/OQIEpHBI+AeSiF6gMWP80i8MzjWCuYT2vUhzvaDC WwCQ== X-Gm-Message-State: AOJu0Yz947bnPfHTZqE/6Mnr/NhZuNAqjlvVP8FsEHtcIKIRwI5Mja/3 rJmiSvJYYqsvwjjwAXvYFq7ktjTZxAuekIBxlk0v1qvEZnGY/z6eA+0G79yYggGO5BDMAX0SnrN E69pAqCV5LW5jAIG1a8/pafEb3UDNge6dV1HJwIFq+IfGgdXb8gJB9/V3sSGkbOBwnu3eUyPcou Q= X-Received: by 2002:a17:907:788:b0:9c3:e158:3168 with SMTP id xd8-20020a170907078800b009c3e1583168mr3565190ejb.30.1697617713254; Wed, 18 Oct 2023 01:28:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzo4yffqQkYBtlfEDshpowdmcCdmJsy348xNbNDwQKLzArjdeBRHIZB9KovxHlBUPz4e82mA== X-Received: by 2002:a17:907:788:b0:9c3:e158:3168 with SMTP id xd8-20020a170907078800b009c3e1583168mr3565179ejb.30.1697617712977; Wed, 18 Oct 2023 01:28:32 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id q10-20020a170906b28a00b009b9af27d98csm1165325ejz.132.2023.10.18.01.28.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/32] tests/tcg/arm: move non-SVE tests out of conditional Date: Wed, 18 Oct 2023 10:27:41 +0200 Message-ID: <20231018082752.322306-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org test-aes, sha1-vector and sha512-vector need not be conditional on $(CROSS_CC_HAS_SVE), reorganize the "if"s to move them outside. Signed-off-by: Paolo Bonzini --- tests/tcg/aarch64/Makefile.target | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 2efacf9a5a3..d01b8ff47c8 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -73,11 +73,6 @@ endif # System Registers Tests AARCH64_TESTS += sysregs -ifneq ($(CROSS_CC_HAS_SVE),) -# SVE ioctl test -AARCH64_TESTS += sve-ioctls -sve-ioctls: CFLAGS+=-march=armv8.1-a+sve - AARCH64_TESTS += test-aes test-aes: CFLAGS += -O -march=armv8-a+aes test-aes: test-aes-main.c.inc @@ -100,12 +95,15 @@ sha512-vector: sha512.c TESTS += sha512-vector ifneq ($(CROSS_CC_HAS_SVE),) +# SVE ioctl test +AARCH64_TESTS += sve-ioctls +sve-ioctls: CFLAGS+=-march=armv8.1-a+sve + sha512-sve: CFLAGS=-O3 -march=armv8.1-a+sve sha512-sve: sha512.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) TESTS += sha512-sve -endif ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py From patchwork Wed Oct 18 08:27:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=N4IxAbnv; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PFy3MF1z20Pd for ; Wed, 18 Oct 2023 19:31:34 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1v2-0001tN-55; Wed, 18 Oct 2023 04:28:44 -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 1qt1uz-0001rz-9o for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:41 -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 1qt1ux-0003gh-DJ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ayQDGD0KDHpChZfjokOgZU/RN7AItjCsSgvYi1ccBg=; b=N4IxAbnv3An1BoGDxo0sNB6dhsRkx76U156QxRW1dIo/YaQpdHW6GgWSUuimH8XT78aZg7 jSGyKc1sXxsw/sTiXlGPJDQ6UPP6TEWuXT2n/4Ih/M8sX1uFKv0jYXq8toEA4Q7ONavmQB /tJCp8hd30Qw3UXLjbaHwNcG4BVxRps= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-64-FD5--gG6Pzqhj35o3mrrxw-1; Wed, 18 Oct 2023 04:28:37 -0400 X-MC-Unique: FD5--gG6Pzqhj35o3mrrxw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bcb13d8ddso486665166b.0 for ; Wed, 18 Oct 2023 01:28:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617715; x=1698222515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4ayQDGD0KDHpChZfjokOgZU/RN7AItjCsSgvYi1ccBg=; b=EN2aiewjU/U2Ov5wobpIXiJTaMzgmBhNrnTsId/8BigF2n1sGd0yszscJ1daBvB7mf T6SQ9B5Bl30AdrbwKVyIsQduWG+msJs+fJPs1F5REWqSpx3nyovxy0LJNX24YAAvnlcj nxWattk/OnqHKyFRCaZd6/2yw+lfq+mtWlDVFX3jQCslmEUIJ0mtpdp2bnhH2nKG5w8E rJ4COUjrmX702Pmg0CrRH7K+8oO1E0l6vpAPX+HJ6o2paG9AVQLFwdj+o7EykjbQ2lGh tKWIN0y2ohRE7F8cFauI+lbQUxXj7Adif5v6Ykl6sNzf6juhsnCUsTUNjfVhR8joc8rq j7AQ== X-Gm-Message-State: AOJu0Yw2dXKIv7caW2G5eP6+gxGycdd8cAIrJG/2ji+KDtPgfC3/E5Cg N4yLJZe3hhESsl9gn0A3/168C6gj/IxKs22wt6kun0piVw2L1Vb7BYo7oySMb+7eL7NoXN1pMQ/ k7ik+qF2BubkYmOen02IvnFGnakfjQNoQlrnymxoaWCIzV+bZPoNdc4n4/gPtGd1tNmIKPx5Dz1 U= X-Received: by 2002:a17:906:2b89:b0:9b2:b152:b0f2 with SMTP id m9-20020a1709062b8900b009b2b152b0f2mr2923750ejg.10.1697617715671; Wed, 18 Oct 2023 01:28:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGikZ8blbxOLG4dKKjdH+TaBme2S+y/rr9wx7I3x4+sUmf3qInYyLtZIraoyuZ98/1luZ/qMw== X-Received: by 2002:a17:906:2b89:b0:9b2:b152:b0f2 with SMTP id m9-20020a1709062b8900b009b2b152b0f2mr2923739ejg.10.1697617715285; Wed, 18 Oct 2023 01:28:35 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bt10-20020a170906b14a00b0098884f86e41sm1151972ejb.123.2023.10.18.01.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Emmanouil Pitsidianakis Subject: [PULL 22/32] configure, tests/tcg: simplify GDB conditionals Date: Wed, 18 Oct 2023 10:27:42 +0200 Message-ID: <20231018082752.322306-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Unify HAVE_GDB_BIN (currently in config-host.mak) and HOST_GDB_SUPPORTS_ARCH into a single GDB variable in config-target.mak. Reviewed-by: Emmanouil Pitsidianakis Signed-off-by: Paolo Bonzini --- configure | 30 +++++++++---------- meson.build | 4 +-- tests/tcg/aarch64/Makefile.target | 6 ++-- tests/tcg/multiarch/Makefile.target | 18 ++++------- .../multiarch/system/Makefile.softmmu-target | 15 ++++------ tests/tcg/s390x/Makefile.target | 6 ++-- 6 files changed, 33 insertions(+), 46 deletions(-) diff --git a/configure b/configure index 9f782054509..ffcfabb8d36 100755 --- a/configure +++ b/configure @@ -1140,6 +1140,18 @@ if test "$tcg" = "auto"; then fi fi +######################################### +# gdb test + +if test -n "$gdb_bin"; then + gdb_version=$($gdb_bin --version | head -n 1) + if version_ge ${gdb_version##* } 9.1; then + gdb_arches=$($python "$source_path/scripts/probe-gdb-support.py" $gdb_bin) + else + gdb_bin="" + fi +fi + ########################################## # big/little endian test cat > $TMPC << EOF @@ -1660,17 +1672,7 @@ fi echo "SRC_PATH=$source_path" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak - -if test -n "$gdb_bin"; then - gdb_version=$($gdb_bin --version | head -n 1) - if version_ge ${gdb_version##* } 9.1; then - echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak - gdb_arches=$($python "$source_path/scripts/probe-gdb-support.py" $gdb_bin) - else - gdb_bin="" - fi -fi - +echo "GDB=$gdb_bin" >> $config_host_mak if test "$container" != no; then echo "RUNC=$runc" >> $config_host_mak fi @@ -1715,10 +1717,6 @@ mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -# versioned checked in the main config_host.mak above -if test -n "$gdb_bin"; then - echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak -fi if test "$plugins" = "yes" ; then echo "CONFIG_PLUGIN=y" >> $config_host_mak fi @@ -1755,7 +1753,7 @@ for target in $target_list; do # will GDB work with these binaries? if test "${gdb_arches#*$arch}" != "$gdb_arches"; then - echo "HOST_GDB_SUPPORTS_ARCH=y" >> "$config_target_mak" + echo "GDB=$gdb_bin" >> $config_target_mak fi echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs diff --git a/meson.build b/meson.build index 1be9f92f7da..2bda62a2b1b 100644 --- a/meson.build +++ b/meson.build @@ -4021,8 +4021,8 @@ summary(summary_info, bool_yn: true, section: 'Directories') summary_info = {} summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())} summary_info += {'sphinx-build': sphinx_build} -if config_host.has_key('HAVE_GDB_BIN') - summary_info += {'gdb': config_host['HAVE_GDB_BIN']} +if config_host.has_key('GDB') + summary_info += {'gdb': config_host['GDB']} endif summary_info += {'iasl': iasl} summary_info += {'genisoimage': config_host['GENISOIMAGE']} diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index d01b8ff47c8..62b38c792fb 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -105,19 +105,19 @@ sha512-sve: sha512.c TESTS += sha512-sve -ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) +ifneq ($(GDB),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py run-gdbstub-sysregs: sysregs $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve.py, \ basic gdbstub SVE support) run-gdbstub-sve-ioctls: sve-ioctls $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \ basic gdbstub SVE ZLEN support) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 43bddeaf212..f3bfaf1a228 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -63,45 +63,39 @@ run-test-mmap: test-mmap run-test-mmap-%: test-mmap $(call run-test, test-mmap-$*, $(QEMU) -p $* $<, $< ($* byte pages)) -ifneq ($(HAVE_GDB_BIN),) -ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) +ifneq ($(GDB),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py run-gdbstub-sha1: sha1 $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \ basic gdbstub support) run-gdbstub-qxfer-auxv-read: sha1 $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \ basic gdbstub qXfer:auxv:read support) run-gdbstub-proc-mappings: sha1 $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-proc-mappings.py, \ proc mappings support) run-gdbstub-thread-breakpoint: testthread $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-thread-breakpoint.py, \ hitting a breakpoint on non-main thread) - else run-gdbstub-%: - $(call skip-test, "gdbstub test $*", "no guest arch support") -endif -else -run-gdbstub-%: - $(call skip-test, "gdbstub test $*", "need working gdb") + $(call skip-test, "gdbstub test $*", "need working gdb with $(patsubst -%,,$(TARGET_NAME)) support") endif EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read \ run-gdbstub-proc-mappings run-gdbstub-thread-breakpoint diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target index 90810a32b2f..dee4f58dea1 100644 --- a/tests/tcg/multiarch/system/Makefile.softmmu-target +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target @@ -14,13 +14,12 @@ VPATH+=$(MULTIARCH_SYSTEM_SRC) MULTIARCH_TEST_SRCS=$(wildcard $(MULTIARCH_SYSTEM_SRC)/*.c) MULTIARCH_TESTS = $(patsubst $(MULTIARCH_SYSTEM_SRC)/%.c, %, $(MULTIARCH_TEST_SRCS)) -ifneq ($(HAVE_GDB_BIN),) -ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) +ifneq ($(GDB),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py run-gdbstub-memory: memory $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) \ --output $<.gdb.out \ --qargs \ @@ -29,7 +28,7 @@ run-gdbstub-memory: memory softmmu gdbstub support) run-gdbstub-interrupt: interrupt $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) \ --output $<.gdb.out \ --qargs \ @@ -38,7 +37,7 @@ run-gdbstub-interrupt: interrupt softmmu gdbstub support) run-gdbstub-untimely-packet: hello $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --gdb-args "-ex 'set debug remote 1'" \ --output untimely-packet.gdb.out \ --stderr untimely-packet.gdb.err \ @@ -51,11 +50,7 @@ run-gdbstub-untimely-packet: hello "GREP", file untimely-packet.gdb.err) else run-gdbstub-%: - $(call skip-test, "gdbstub test $*", "no guest arch support") -endif -else -run-gdbstub-%: - $(call skip-test, "gdbstub test $*", "need working gdb") + $(call skip-test, "gdbstub test $*", "need working gdb with $(patsubst -%,,$(TARGET_NAME)) support") endif MULTIARCH_RUNS += run-gdbstub-memory run-gdbstub-interrupt run-gdbstub-untimely-packet diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index c650aefe5c1..826f0a18e43 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -81,12 +81,12 @@ $(Z15_TESTS): CFLAGS+=-march=z15 -O2 TESTS+=$(Z15_TESTS) endif -ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) +ifneq ($(GDB),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py run-gdbstub-signals-s390x: signals-s390x $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(S390X_SRC)/gdbstub/test-signals-s390x.py, \ mixing signals and debugging) @@ -95,7 +95,7 @@ hello-s390x-asm: CFLAGS+=-nostdlib run-gdbstub-svc: hello-s390x-asm $(call run-test, $@, $(GDB_SCRIPT) \ - --gdb $(HAVE_GDB_BIN) \ + --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(S390X_SRC)/gdbstub/test-svc.py, \ single-stepping svc) From patchwork Wed Oct 18 08:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WB+V/7O8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PGc285xz20Pd for ; Wed, 18 Oct 2023 19:32:07 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vI-0002I4-6E; Wed, 18 Oct 2023 04:29: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 1qt1vB-00027R-Kz for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28: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 1qt1v9-0003i6-NX for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617731; 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=lOV11LHJmh8G61u7keMaCTfvvIJIPpPLJVUoEioDRH8=; b=WB+V/7O8p4t92y5TQO1swqCFT9PXIuZ2wKpNEgBK/x/340VKYX6SChgujx6QoNjDK8ZJRd a0zCBzIf6UcW9u7Dg1DNtP2aDOK0ZXVSnnxpXNH0Jy7kiztlOzDgi0lG9RUBGDqbMGdse1 tuhvyJbPOvRK7zbM93tVGU7zIVpYYVU= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-ulEYh87qMe6IJ8_uM8vhYw-1; Wed, 18 Oct 2023 04:28:39 -0400 X-MC-Unique: ulEYh87qMe6IJ8_uM8vhYw-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9ba247e03aeso461812466b.1 for ; Wed, 18 Oct 2023 01:28:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617718; x=1698222518; 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=lOV11LHJmh8G61u7keMaCTfvvIJIPpPLJVUoEioDRH8=; b=axCO6Y/bzCulx0FDHl5RUq0oomV+HbeS5B3WgO1hNEHfUi9ySYt3wksTVNAO328daZ 1fvc5M23ZUxCH5shspRJLzIywX4fg/gYI5G1gMpwt2aBhFZlLJSdFf+QIyj3GWMpufy+ 3k8IduF6KXQ3oFYlRTt5VDivN+6L4hkukdKFPopUpgmK8wE/rHYAcMPveEldr6DSSGzB cUVIZzB1C6haJW3hgc12AV0Vp1ddIkZMjIAXz4A4sbCa+gzJlav0EKBGdFea9+zAe/m6 GFzbcqyhGE9uAcN79PoijPfLNPD7DVxWzX0V7K8vhe1YyAdbBw40ixz5SEzEnuHQmQMX gI1A== X-Gm-Message-State: AOJu0YxQ+GvSYWUKNWHNITwrOTDfaEhM7elUZFlRFhn4yvtsqRsYoFlz 3vpM1RlJlrpkyF+iDs2cK7s3CKlgOvnDVmhliK0tFWeFBCsve4klUYXukoFN4oyKhjgrPBiQOL8 DwEWKPAvbhc2L/HdF4keOoxxlJL+znAxNTTV9RGuM6J9kBxu17Va/EGiuT028BNV1WXqpJyQPfV o= X-Received: by 2002:a17:906:7955:b0:9bd:a73a:7a0a with SMTP id l21-20020a170906795500b009bda73a7a0amr3451320ejo.58.1697617717701; Wed, 18 Oct 2023 01:28:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQNuOfxYA1ZdyvPCXpqf/sSdHH+hG4Vcoy/3DqqTCPhz7cZCzpTOp1Sd6ylzTf7A2H5OYIig== X-Received: by 2002:a17:906:7955:b0:9bd:a73a:7a0a with SMTP id l21-20020a170906795500b009bda73a7a0amr3451307ejo.58.1697617717273; Wed, 18 Oct 2023 01:28:37 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id f27-20020a1709062c5b00b0098e78ff1a87sm1174541ejh.120.2023.10.18.01.28.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/32] configure: clean up plugin option handling Date: Wed, 18 Oct 2023 10:27:43 +0200 Message-ID: <20231018082752.322306-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Keep together all the conditions that lead to disabling plugins, and remove now-dead code. Since the option was not in SKIP_OPTIONS, it was present twice in the help message, both from configure and from meson-buildoptions.sh. Remove the duplication and take the occasion to document the option as autodetected, which it is. Signed-off-by: Paolo Bonzini --- configure | 39 +++++++++++++++-------------------- scripts/meson-buildoptions.py | 17 ++++++++++----- scripts/meson-buildoptions.sh | 2 +- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/configure b/configure index ffcfabb8d36..688577bebd8 100755 --- a/configure +++ b/configure @@ -377,7 +377,6 @@ fi case $targetos in windows) - plugins="no" pie="no" ;; haiku) @@ -741,7 +740,6 @@ for opt do default_cflags='-O0 -g' ;; --disable-tcg) tcg="disabled" - plugins="no" ;; --enable-tcg) tcg="enabled" ;; @@ -778,11 +776,7 @@ for opt do ;; --enable-download) download="enabled"; git_submodules_action=update; ;; - --enable-plugins) if test "$targetos" = "windows"; then - error_exit "TCG plugins not currently supported on Windows platforms" - else - plugins="yes" - fi + --enable-plugins) plugins="yes" ;; --disable-plugins) plugins="no" ;; @@ -808,11 +802,6 @@ then git_submodules_action="validate" fi -# test for any invalid configuration combinations -if test "$plugins" = "yes" -a "$tcg" = "disabled"; then - error_exit "Can't enable plugins on non-TCG builds" -fi - if ! test -f "$source_path/subprojects/keycodemapdb/README" \ && test "$download" = disabled then @@ -923,8 +912,6 @@ Advanced options (experts only): --enable-debug enable common debug build options --disable-werror disable compilation abort on warning --cpu=CPU Build for host CPU [$cpu] - --enable-plugins - enable plugins via shared library loading --disable-containers don't use containers for cross-building --container-engine=TYPE which container engine to use [$container_engine] --gdb=GDB-path gdb to use for gdbstub tests [$gdb_bin] @@ -1066,15 +1053,27 @@ if test "$targetos" = "bogus"; then error_exit "Unrecognized host OS (uname -s reports '$(uname -s)')" fi +# test for any invalid configuration combinations +if test "$targetos" = "windows"; then + if test "$plugins" = "yes"; then + error_exit "TCG plugins not currently supported on Windows platforms" + fi + plugins="no" +fi +if test "$tcg" = "disabled" ; then + if test "$plugins" = "yes"; then + error_exit "Can't enable plugins on non-TCG builds" + fi + plugins="no" +fi if test "$static" = "yes" ; then if test "$plugins" = "yes"; then error_exit "static and plugins are mutually incompatible" - else - plugins="no" fi + plugins="no" fi -test "$plugins" = "" && plugins=yes -if test "$plugins" = "yes"; then +if test "$plugins" != "no"; then + plugins=yes subdirs="$subdirs contrib/plugins" fi @@ -1717,10 +1716,6 @@ mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -if test "$plugins" = "yes" ; then - echo "CONFIG_PLUGIN=y" >> $config_host_mak -fi - tcg_tests_targets= for target in $target_list; do arch=${target%%-*} diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 8d2e526132a..b787c84e914 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -44,6 +44,11 @@ "trace_file": "with-trace-file", } +# Options that configure autodetects, even though meson defines them as boolean +AUTO_OPTIONS = { + "plugins", +} + BUILTIN_OPTIONS = { "b_coverage", "b_lto", @@ -168,6 +173,7 @@ def cli_metavar(opt): def print_help(options): print("meson_options_help() {") + feature_opts = [] for opt in sorted(options, key=cli_help_key): key = cli_help_key(opt) # The first section includes options that have an arguments, @@ -176,7 +182,7 @@ def print_help(options): metavar = cli_metavar(opt) left = f"--{key}={metavar}" help_line(left, opt, 27, True) - elif opt["type"] == "boolean": + elif opt["type"] == "boolean" and opt["name"] not in AUTO_OPTIONS: left = f"--{key}" help_line(left, opt, 27, False) elif allow_arg(opt): @@ -185,16 +191,17 @@ def print_help(options): else: left = f"--{key}=CHOICE" help_line(left, opt, 27, True) + else: + feature_opts.append(opt) sh_print() sh_print("Optional features, enabled with --enable-FEATURE and") sh_print("disabled with --disable-FEATURE, default is enabled if available") sh_print("(unless built with --without-default-features):") sh_print() - for opt in options: - key = opt["name"].replace("_", "-") - if opt["type"] != "boolean" and not allow_arg(opt): - help_line(key, opt, 18, False) + for opt in sorted(feature_opts, key=cli_option): + key = cli_option(opt) + help_line(key, opt, 18, False) print("}") diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index d4b89e6b443..22d69966606 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -40,7 +40,6 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-module-upgrades try to load modules from alternate paths for' printf "%s\n" ' upgrades' - printf "%s\n" ' --enable-plugins TCG plugins via shared library loading' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u)random and' printf "%s\n" ' getrandom()' printf "%s\n" ' --enable-safe-stack SafeStack Stack Smash Protection (requires' @@ -149,6 +148,7 @@ meson_options_help() { printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' parallels parallels image format support' printf "%s\n" ' pipewire PipeWire sound support' + printf "%s\n" ' plugins TCG plugins via shared library loading' printf "%s\n" ' png PNG support with libpng' printf "%s\n" ' pvrdma Enable PVRDMA support' printf "%s\n" ' qcow1 qcow1 image format support' From patchwork Wed Oct 18 08:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=M76EbZFd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PCM0sZrz20Zj for ; Wed, 18 Oct 2023 19:29:19 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1v9-00020w-LW; Wed, 18 Oct 2023 04:28:51 -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 1qt1v1-0001tZ-Ug for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:44 -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 1qt1v0-0003h1-02 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617721; 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=LNvcZL7dzJpk+WxEGf93CDtkxQYWrnxI3lWgosy3qaE=; b=M76EbZFds6vJI2shCtJ8jEsb+tMe7cfGDx8N4er8I8nCqeg7ISV+8bi3l3FYd+D7vIluM5 HllqPDiFqB/PgbzhopRh6MnUUWZnnImV3lsPrVqqMhwdpJwSAYi4hgY2oNc4ttd94L2H2x vdZipJ46YX9Dz7hykAXUWO0qBx0Dtxs= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-n4VuPriXNEKjLxUSTtYAIQ-1; Wed, 18 Oct 2023 04:28:40 -0400 X-MC-Unique: n4VuPriXNEKjLxUSTtYAIQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ae0601d689so435262166b.0 for ; Wed, 18 Oct 2023 01:28:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617718; x=1698222518; 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=LNvcZL7dzJpk+WxEGf93CDtkxQYWrnxI3lWgosy3qaE=; b=VRDKXchXpeY8r2pFFwt+xs5Yz175YQ9LqIMFg2ALik7nnedpyc/794WQJs3yTrljhl hxNbVJlxiUVggEfZS9A6EEpI7ZZ/pB99kltLwsfGxN5aCyWsvMGCU6LixSKTVzgSNwWf 1SfM1gM/HVcisRburPsCPxKuA9sNC4Ldlpa04BLZOrPaNU3UeodNQ22tyUQ37Ug2hwic P3qe/GjiDfH/L4xlGAtpPKaNJgTg9YCf+cWjxFMAPMrWQmJFA0DfVKaymsO2VT61KFbC yNS1mTWP16WjoSbuAaS/CruQM5lfItWmBAsS5H5g4hyiZTdm0mTcROY3LDnzpdekj4Lw EYIA== X-Gm-Message-State: AOJu0YyYPJzyCL21XujylVrhMsBebsNeez1LkBqqvXyfZt9aE9nlzmud aZYema9jaZPL0LLgL4AIiUqoe0FLBp4VjAjFodS1HIs5xt9cdF/43XrNp7iLBFdOQ5GroJkj/mx oIfC+ZGWXBBl5uSFZ6+LKsRjYYG5Y42Mls4bQg+uKSHemg91rl3EOJNSoa+SZ0sjgQMH6ZjmVTa Q= X-Received: by 2002:a17:907:6096:b0:9aa:63d:9ede with SMTP id ht22-20020a170907609600b009aa063d9edemr4289440ejc.9.1697617718653; Wed, 18 Oct 2023 01:28:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNreSK9S+6wPWqVdy4ny6GN5VKMLe6u7qfMlKrWgo7CaZ336+VXnI8/lBzBhZ1wt4vYFBqPg== X-Received: by 2002:a17:907:6096:b0:9aa:63d:9ede with SMTP id ht22-20020a170907609600b009aa063d9edemr4289430ejc.9.1697617718403; Wed, 18 Oct 2023 01:28:38 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id os20-20020a170906af7400b009ad89697c86sm1199439ejb.144.2023.10.18.01.28.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/32] configure: clean up PIE option handling Date: Wed, 18 Oct 2023 10:27:44 +0200 Message-ID: <20231018082752.322306-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Keep together all the conditions that lead to disabling PIE. Signed-off-by: Paolo Bonzini --- configure | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 688577bebd8..5c1d618f102 100755 --- a/configure +++ b/configure @@ -373,17 +373,6 @@ else targetos=bogus fi -# OS specific - -case $targetos in -windows) - pie="no" -;; -haiku) - pie="no" -;; -esac - if test ! -z "$cpu" ; then # command line argument : @@ -1088,19 +1077,23 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF -if test "$static" = "yes"; then - if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then +if test "$targetos" = windows || test "$targetos" = haiku; then + if test "$pie" = "yes"; then + error_exit "PIE not available due to missing OS support" + fi + pie=no +fi + +if test "$pie" != "no"; then + if test "$static" = "yes"; then + pie_ldflags=-static-pie + else + pie_ldflags=-pie + fi + if compile_prog "-Werror -fPIE -DPIE" "$pie_ldflags"; then pie="yes" elif test "$pie" = "yes"; then error_exit "-static-pie not available due to missing toolchain support" - else - pie="no" - fi -elif test "$pie" != "no"; then - if compile_prog "-Werror -fPIE -DPIE" "-pie"; then - pie="yes" - elif test "$pie" = "yes"; then - error_exit "PIE not available due to missing toolchain support" else echo "Disabling PIE due to missing toolchain support" pie="no" From patchwork Wed Oct 18 08:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Rw/a4qOx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PK30k4Tz20Pd for ; Wed, 18 Oct 2023 19:34:15 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vI-0002JO-HT; Wed, 18 Oct 2023 04:29: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 1qt1v3-0001u6-EN for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:45 -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 1qt1v2-0003hE-3T for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZMUo0Uu+HhBZFMdwvQI2ABnUonV+UN1ImTyE2l0jrPg=; b=Rw/a4qOxUCaYFrUxeHrVpXhg2kaYaId+KKM9HCYXgK5LAAlitCO/kZNJKRGlMv9t0FTFK1 qium3k+l3FkD/ykKCQh8riTWKQbXQNtJLDOQ5qmmLIjHqUmXVKejHpOkDrgnSl3TPKNybX hC4pEsRnjVkljAwm85hWV/Edvm3VwFk= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-286-R3gahaebNVKjD9_sDAHHFQ-1; Wed, 18 Oct 2023 04:28:42 -0400 X-MC-Unique: R3gahaebNVKjD9_sDAHHFQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9b274cc9636so486260766b.0 for ; Wed, 18 Oct 2023 01:28:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617720; x=1698222520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZMUo0Uu+HhBZFMdwvQI2ABnUonV+UN1ImTyE2l0jrPg=; b=P+UBUwm4VWy9QRp+TYpj/YJE3WkxxxRwVASZVNQ7mYrswNm0zCWPeHHLWLfgMO9kH4 4f6Tr6paA/DfuM48eizN29a2makrojNRToJTWQ8udL+Y6Ea2n0x5d033g1j2CtB5i5M5 uFHLcJrBwz3Rzd5RpHt+KRV4dqgTbHAebavz1Rz7PC+YHoCzvvxIJJyYkTXCYScDVq9q /i2EWpbYlc1hCPYzJRZ2XdHJdZ5qLqcq8RGdCJ3naebzanpVc/OnHJh7BsnFkQUb09WL I0tUoK5JEQINND4O9cgoz1RVn2gaODMNy8HBkPSZdRS2qQZXX9X5lLagLp5D/SMcpWAU Tufw== X-Gm-Message-State: AOJu0YzG0Sfsz4Uys0dbJpZriLvsglLL2uXcmEiEYasPGVg7WczVG5JV 4ET9Ogb2+Lzgz52D9MzA3oAjB6XzMJFvWVXqOBTmxqLTAMble7Oy2eVR+g3NUw9GQIKqdTw4o4q 6r/fhza3YRkEtzZrGTmYeR1bGan2+L3C673OR49bC5CwQMGtiB59z0xe7i6f5K80T9Og93MZY64 o= X-Received: by 2002:a17:906:4fce:b0:9be:e278:4d47 with SMTP id i14-20020a1709064fce00b009bee2784d47mr4325071ejw.27.1697617720333; Wed, 18 Oct 2023 01:28:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9hY04LakArjSx0gsQSZdvGUOTLLA7Wn+i4FgRDdgiwROzh36v0VVBV3xmKrzE6UVKuOXpUQ== X-Received: by 2002:a17:906:4fce:b0:9be:e278:4d47 with SMTP id i14-20020a1709064fce00b009bee2784d47mr4325053ejw.27.1697617720045; Wed, 18 Oct 2023 01:28:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id rs13-20020a170907036d00b009c3f8f46c22sm1201757ejb.77.2023.10.18.01.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 25/32] configure: remove some dead cruft Date: Wed, 18 Oct 2023 10:27:45 +0200 Message-ID: <20231018082752.322306-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org print_error is only invoked in one place, and $git is unused. Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure b/configure index 5c1d618f102..0994f54530c 100755 --- a/configure +++ b/configure @@ -94,7 +94,7 @@ quote_sh() { printf "%s" "$1" | sed "s,','\\\\'',g; s,.*,'&'," } -print_error() { +error_exit() { (echo echo "ERROR: $1" while test -n "$2"; do @@ -102,10 +102,6 @@ print_error() { shift done echo) >&2 -} - -error_exit() { - print_error "$@" exit 1 } @@ -248,7 +244,6 @@ done default_cflags='-O2 -g' git_submodules_action="update" -git="git" docs="auto" EXESUF="" prefix="/usr/local" From patchwork Wed Oct 18 08:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HptOqUra; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PF90Pyqz20Pd for ; Wed, 18 Oct 2023 19:30:53 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1wB-00046Q-29; Wed, 18 Oct 2023 04:29:55 -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 1qt1vV-0002mB-JA for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:29:16 -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 1qt1vO-0003jc-FZ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:29:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617745; 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=CLjhPjGdV9P1B3Px9THOBvhOzGu2EdgUFKT1l6imsao=; b=HptOqUraNsBt5NPOlDe0A5FJo3Y1Zjkl4ldXHdtfS0JMbMBmq6KDVHE0US5rQBk9SAasqy f+SYcUqFLiJiTrntMoHpFN1DQmXwFfbMCBxPg4DsTgnQ+x2UDZ5gcyVE41wtYh+nR9+CU1 i+pBQrhYGv6eSEQQrYvYb3MxDj4qqHU= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-H-cscebAPjSm7Zd13AhaFA-1; Wed, 18 Oct 2023 04:28:44 -0400 X-MC-Unique: H-cscebAPjSm7Zd13AhaFA-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9b65c46bca8so192462366b.1 for ; Wed, 18 Oct 2023 01:28:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617722; x=1698222522; 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=CLjhPjGdV9P1B3Px9THOBvhOzGu2EdgUFKT1l6imsao=; b=XF/627KKm20H3wAOFe15h8Oe3rsuw/pJzSiszaRU93HTaezDWh5uiopCsO4Y7VMFii Ir3ZtyF4lrdTFImzKyVUmE1evRqN804kzh9hC36MD01TI1XW6sFdO2Arc8q7wZXj8hOX iahv9usPU2oTQbqp5GmXm5ngAGsN/dmi725pEa/0hoKN+rmJQoGZcqk5/H7BKbJH8etJ SMs1GE1gIMFimHzjAurUgEGUvxHmKKp/JWLp+A1u2OiuKNhj8JNl1/kECQNlXu4elKfd kfPGNcIZ07SiFEv4+GweAnNIGLaHFerjgkDSwsvyRkSfefNI20itRbuJACtkA9O+0DtU T6gA== X-Gm-Message-State: AOJu0YyVsLHFGT3M+0KmfULpjcaugb+UZAME7fRlT/M5DvwaPVqVxdKp YD88UcXBZywfOWYUAsq0G78LaZ0kbzvuPqWQhz8wUsAgNg3KNhbaMHBYdBAFGN0Ko0627XmJhc3 eWhxyqjiN7iCH8s4xT3vXgUjGU/ohSdqApAM6S6C12OG2jSe8mZZP5uqLOXlCBkgb+LB4QvArg+ Q= X-Received: by 2002:a50:d089:0:b0:53e:78ed:924d with SMTP id v9-20020a50d089000000b0053e78ed924dmr3269023edd.5.1697617722242; Wed, 18 Oct 2023 01:28:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPloHHYZwPPJVwJddu13Hk8N3sRPc7XoS+GYFHln7cn2yBDCHULnclwC5PuVZUrYr/uDE0DA== X-Received: by 2002:a50:d089:0:b0:53e:78ed:924d with SMTP id v9-20020a50d089000000b0053e78ed924dmr3269013edd.5.1697617721778; Wed, 18 Oct 2023 01:28:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id cf14-20020a0564020b8e00b0053e0395059csm2374872edb.21.2023.10.18.01.28.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/32] configure: move target-specific defaults to an external machine file Date: Wed, 18 Oct 2023 10:27:46 +0200 Message-ID: <20231018082752.322306-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Enable Windows-specific defaults with a machine file, so that related options can be automatically parsed and included in the help message. Signed-off-by: Paolo Bonzini --- configs/meson/windows.txt | 9 +++++++++ configure | 37 ++++++++++++++--------------------- scripts/meson-buildoptions.py | 4 +++- scripts/meson-buildoptions.sh | 7 +++++++ 4 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 configs/meson/windows.txt diff --git a/configs/meson/windows.txt b/configs/meson/windows.txt new file mode 100644 index 00000000000..55b192e71b1 --- /dev/null +++ b/configs/meson/windows.txt @@ -0,0 +1,9 @@ +# target-specific defaults, can still be overridden on +# the command line + +[built-in options] +bindir = '' +prefix = '/qemu' + +[project options] +qemu_suffix = '' diff --git a/configure b/configure index 0994f54530c..8f23c8d1655 100755 --- a/configure +++ b/configure @@ -246,8 +246,6 @@ default_cflags='-O2 -g' git_submodules_action="update" docs="auto" EXESUF="" -prefix="/usr/local" -qemu_suffix="qemu" system="yes" linux_user="" bsd_user="" @@ -256,7 +254,6 @@ subdirs="" ninja="" python= download="enabled" -bindir="bin" skip_meson=no use_containers="yes" gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb") @@ -583,9 +580,6 @@ done if test "$targetos" = "windows" ; then EXESUF=".exe" - prefix="/qemu" - bindir="" - qemu_suffix="" fi meson_option_build_array() { @@ -622,6 +616,14 @@ meson_option_parse() { fi } +meson_add_machine_file() { + if test "$cross_compile" = "yes"; then + meson_option_add --cross-file "$1" + else + meson_option_add --native-file "$1" + fi +} + for opt do optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') case "$opt" in @@ -629,8 +631,6 @@ for opt do ;; --version|-V) exec cat "$source_path/VERSION" ;; - --prefix=*) prefix="$optarg" - ;; --cross-prefix=*) ;; --cc=*) @@ -701,10 +701,6 @@ for opt do ;; --static) static="yes" ;; - --bindir=*) bindir="$optarg" - ;; - --with-suffix=*) qemu_suffix="$optarg" - ;; --host=*|--build=*|\ --disable-dependency-tracking|\ --sbindir=*|--sharedstatedir=*|\ @@ -861,7 +857,6 @@ Options: [defaults in brackets after descriptions] Standard options: --help print this message - --prefix=PREFIX install in PREFIX [$prefix] --target-list=LIST set target list (default: build all) $(echo Available targets: $default_target_list | \ fold -s -w 53 | sed -e 's/^/ /') @@ -886,8 +881,6 @@ Advanced options (experts only): --ninja=NINJA use specified ninja [$ninja] --smbd=SMBD use specified smbd [$smbd] --static enable static build [$static] - --bindir=PATH install binaries in PATH - --with-suffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir/docdir [$qemu_suffix] --without-default-features default all --enable-* options to "disabled" --without-default-devices do not include any device that is not needed to start the emulator (only use if you are including @@ -1803,24 +1796,25 @@ if test "$skip_meson" = no; then else echo "endian = 'little'" >> $cross fi - cross_arg="--cross-file config-meson.cross" native="config-meson.native.new" echo "# Automatically generated by configure - do not modify" > $native echo "[binaries]" >> $native echo "c = [$(meson_quote $host_cc)]" >> $native mv $native config-meson.native - cross_arg="$cross_arg --native-file config-meson.native" - else - cross_arg="--native-file config-meson.cross" + meson_option_add --native-file + meson_option_add config-meson.native fi mv $cross config-meson.cross + meson_add_machine_file config-meson.cross + if test -f "$source_path/configs/meson/$targetos.txt"; then + meson_add_machine_file $source_path/configs/meson/$targetos.txt + fi rm -rf meson-private meson-info meson-logs # Built-in options test "$download" = "disabled" && meson_option_add "--wrap-mode=nodownload" - test "$bindir" != "bin" && meson_option_add "-Dbindir=$bindir" test "$default_feature" = no && meson_option_add -Dauto_features=disabled test "$static" = yes && meson_option_add -Dprefer_static=true test "$pie" = no && meson_option_add -Db_pie=false @@ -1831,11 +1825,10 @@ if test "$skip_meson" = no; then test "$docs" != auto && meson_option_add "-Ddocs=$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test "$plugins" = yes && meson_option_add "-Dplugins=true" - test "$qemu_suffix" != qemu && meson_option_add "-Dqemu_suffix=$qemu_suffix" test "$smbd" != '' && meson_option_add "-Dsmbd=$smbd" test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg" run_meson() { - NINJA=$ninja $meson setup --prefix "$prefix" "$@" $cross_arg "$PWD" "$source_path" + NINJA=$ninja $meson setup "$@" "$PWD" "$source_path" } eval run_meson $meson_options if test "$?" -ne 0 ; then diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index b787c84e914..0c24bdc1e8c 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -28,7 +28,6 @@ SKIP_OPTIONS = { "default_devices", "fuzzing_engine", - "qemu_suffix", "smbd", } @@ -40,6 +39,7 @@ "malloc": "enable-malloc", "pkgversion": "with-pkgversion", "qemu_firmwarepath": "firmwarepath", + "qemu_suffix": "with-suffix", "trace_backends": "enable-trace-backends", "trace_file": "with-trace-file", } @@ -52,6 +52,7 @@ BUILTIN_OPTIONS = { "b_coverage", "b_lto", + "bindir", "datadir", "debug", "includedir", @@ -60,6 +61,7 @@ "localedir", "localstatedir", "mandir", + "prefix", "strip", "sysconfdir", } diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 22d69966606..e1522030619 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -3,6 +3,7 @@ meson_options_help() { printf "%s\n" ' --audio-drv-list=CHOICES Set audio driver list [default] (choices: alsa/co' printf "%s\n" ' reaudio/default/dsound/jack/oss/pa/pipewire/sdl/s' printf "%s\n" ' ndio)' + printf "%s\n" ' --bindir=VALUE Executable directory [bin]' printf "%s\n" ' --block-drv-ro-whitelist=VALUE' printf "%s\n" ' set block driver read-only whitelist (by default' printf "%s\n" ' affects only QEMU, not tools like qemu-img)' @@ -62,6 +63,7 @@ meson_options_help() { printf "%s\n" ' --localedir=VALUE Locale data directory [share/locale]' printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' printf "%s\n" ' --mandir=VALUE Manual page directory [share/man]' + printf "%s\n" ' --prefix=VALUE Installation prefix [/usr/local]' printf "%s\n" ' --sysconfdir=VALUE Sysconf data directory [etc]' printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string' printf "%s\n" ' [NORMAL]' @@ -69,6 +71,8 @@ meson_options_help() { printf "%s\n" ' auto/sigaltstack/ucontext/windows)' printf "%s\n" ' --with-pkgversion=VALUE use specified string as sub-version of the' printf "%s\n" ' package' + printf "%s\n" ' --with-suffix=VALUE Suffix for QEMU data/modules/config directories' + printf "%s\n" ' (can be empty) [qemu]' printf "%s\n" ' --with-trace-file=VALUE Trace file prefix for simple backend [trace]' printf "%s\n" '' printf "%s\n" 'Optional features, enabled with --enable-FEATURE and' @@ -229,6 +233,7 @@ _meson_option_parse() { --disable-gcov) printf "%s" -Db_coverage=false ;; --enable-lto) printf "%s" -Db_lto=true ;; --disable-lto) printf "%s" -Db_lto=false ;; + --bindir=*) quote_sh "-Dbindir=$2" ;; --enable-blkio) printf "%s" -Dblkio=enabled ;; --disable-blkio) printf "%s" -Dblkio=disabled ;; --block-drv-ro-whitelist=*) quote_sh "-Dblock_drv_ro_whitelist=$2" ;; @@ -407,6 +412,7 @@ _meson_option_parse() { --disable-plugins) printf "%s" -Dplugins=false ;; --enable-png) printf "%s" -Dpng=enabled ;; --disable-png) printf "%s" -Dpng=disabled ;; + --prefix=*) quote_sh "-Dprefix=$2" ;; --enable-pvrdma) printf "%s" -Dpvrdma=enabled ;; --disable-pvrdma) printf "%s" -Dpvrdma=disabled ;; --enable-qcow1) printf "%s" -Dqcow1=enabled ;; @@ -414,6 +420,7 @@ _meson_option_parse() { --enable-qed) printf "%s" -Dqed=enabled ;; --disable-qed) printf "%s" -Dqed=disabled ;; --firmwarepath=*) quote_sh "-Dqemu_firmwarepath=$(meson_option_build_array $2)" ;; + --with-suffix=*) quote_sh "-Dqemu_suffix=$2" ;; --enable-qga-vss) printf "%s" -Dqga_vss=enabled ;; --disable-qga-vss) printf "%s" -Dqga_vss=disabled ;; --enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=true ;; From patchwork Wed Oct 18 08:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BxVS87pH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PDb4Fz7z20Pd for ; Wed, 18 Oct 2023 19:30:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vB-00027L-Lq; Wed, 18 Oct 2023 04:28:53 -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 1qt1v7-0001yn-4p for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:49 -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 1qt1v5-0003hb-78 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617726; 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=/FD6YHefX6SOYwoQaJDUAPYd5JubXHFuESbVNleb6xc=; b=BxVS87pHZuk7on9kyaxmX2gN7o7G51blD8izunTqoUcoplQX0yJCMvCX4JPJWCbVyHWtxD GjRN7RssjELxl5/IIsqXueG/EYfsFZQ7LUW1raTTTy2w56UlQ3ODRcRFbXRovREASD6AzG PdG3ebgsXf08JM5103vI/4DU7eNmF3Q= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-338-hI845pAtOQ22PJ-VGGYCcA-1; Wed, 18 Oct 2023 04:28:45 -0400 X-MC-Unique: hI845pAtOQ22PJ-VGGYCcA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-993eeb3a950so433537766b.2 for ; Wed, 18 Oct 2023 01:28:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617724; x=1698222524; 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=/FD6YHefX6SOYwoQaJDUAPYd5JubXHFuESbVNleb6xc=; b=CZg8eMgM+t/rvgP5Z7+f47u+5gjMr9DWXVVOvZXieZ333DgM5omm+ZAkvVHVetTpYI Bg4uY4ts7hxIA0CAoUYbd08UZTCSdRr42PxwOtxsA8YcFB81DyDHimvM7qVINR4t4sh4 QXur8ZYaoXWolmE7wpwgwFo37CyjqqHreyKmg32sGA9QT2C5jHUsqzRWLu22WOxNn8Qx T961ukLhZcRf+n/DcWFVwEe5IrkJXx6jtDR7/rs6eeaKvju/f73q2MvFcm8Hq1O7XcWo 8IBYJ7NKmmoMILYcbSZbAgjrK4mw7r6ek7G690J3WmAqFl37lddX7CPnWb27djsYVebA xF3g== X-Gm-Message-State: AOJu0Yz/h9Ac56zhNLtagivHpdr5cymYj6pHk7pd8szckJpYkb2RMnX4 i3y3oLHu7GJzmjMdMNr1FOlidJh4qADeWJIVZxFNVoDZdVaJ5nnJf8qmC55D1mhE+LpA5LVNoTn GOpRvFkUreu63vjCJb9FGDc1qC2D+yGfAWdVzu3ztsysUyBou/pCkKBfHflq6oB0YWRHMUQEC4P 0= X-Received: by 2002:a17:907:a48b:b0:9c7:5437:841e with SMTP id vp11-20020a170907a48b00b009c75437841emr121170ejc.11.1697617723372; Wed, 18 Oct 2023 01:28:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFIgYQ9/lGLrwQCgAmcp3hdcER7cHfhSfHMfuF6LDiCBSXJkuTjYsZlf28pLGi8+OmT0OyvQ== X-Received: by 2002:a17:907:a48b:b0:9c7:5437:841e with SMTP id vp11-20020a170907a48b00b009c75437841emr121160ejc.11.1697617722997; Wed, 18 Oct 2023 01:28:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id p4-20020a170906b20400b009c7518b131dsm452609ejz.196.2023.10.18.01.28.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/32] configure: move environment-specific defaults to config-meson.cross Date: Wed, 18 Oct 2023 10:27:47 +0200 Message-ID: <20231018082752.322306-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Store the -Werror and SMBD defaults in the machine file, which still allows them to be overridden on the command line and enables automatic parsing of the related options. Signed-off-by: Paolo Bonzini --- configure | 37 +++++++++++++---------------------- scripts/meson-buildoptions.py | 3 ++- scripts/meson-buildoptions.sh | 5 +++++ 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 8f23c8d1655..200570a3d18 100755 --- a/configure +++ b/configure @@ -258,7 +258,6 @@ skip_meson=no use_containers="yes" gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb") gdb_arches="" -werror="" # Don't accept a target_list environment variable. unset target_list @@ -314,7 +313,6 @@ objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" ranlib="${RANLIB-${cross_prefix}ranlib}" nm="${NM-${cross_prefix}nm}" -smbd="$SMBD" strip="${STRIP-${cross_prefix}strip}" widl="${WIDL-${cross_prefix}widl}" windres="${WINDRES-${cross_prefix}windres}" @@ -651,8 +649,6 @@ for opt do ;; --ninja=*) ninja="$optarg" ;; - --smbd=*) smbd="$optarg" - ;; --extra-cflags=*) ;; --extra-cxxflags=*) @@ -744,10 +740,6 @@ for opt do ;; --disable-pie) pie="no" ;; - --enable-werror) werror="yes" - ;; - --disable-werror) werror="no" - ;; --enable-cfi) cfi=true ;; --disable-cfi) cfi=false @@ -879,7 +871,6 @@ Advanced options (experts only): --cross-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases --python=PYTHON use specified python [$python] --ninja=NINJA use specified ninja [$ninja] - --smbd=SMBD use specified smbd [$smbd] --static enable static build [$static] --without-default-features default all --enable-* options to "disabled" --without-default-devices do not include any device that is not needed to @@ -887,7 +878,6 @@ Advanced options (experts only): desired devices in configs/devices/) --with-devices-ARCH=NAME override default configs/devices --enable-debug enable common debug build options - --disable-werror disable compilation abort on warning --cpu=CPU Build for host CPU [$cpu] --disable-containers don't use containers for cross-building --container-engine=TYPE which container engine to use [$container_engine] @@ -1011,17 +1001,6 @@ if test -z "$ninja"; then fi fi -# Consult white-list to determine whether to enable werror -# by default. Only enable by default for git builds -if test -z "$werror" ; then - if test -e "$source_path/.git" && \ - { test "$targetos" = linux || test "$targetos" = "windows"; }; then - werror="yes" - else - werror="no" - fi -fi - if test "$targetos" = "bogus"; then # Now that we know that we're not printing the help and that # the compiler works (so the results of the check_defines we used @@ -1764,6 +1743,20 @@ if test "$skip_meson" = no; then test -n "$objcc" && echo "objc_args = [$(meson_quote $OBJCFLAGS $EXTRA_OBJCFLAGS)]" >> $cross echo "c_link_args = [$(meson_quote $CFLAGS $LDFLAGS $EXTRA_CFLAGS $EXTRA_LDFLAGS)]" >> $cross echo "cpp_link_args = [$(meson_quote $CXXFLAGS $LDFLAGS $EXTRA_CXXFLAGS $EXTRA_LDFLAGS)]" >> $cross + + # Only enable by default for git builds and on select OSes + echo "# environment defaults, can still be overridden on " >> $cross + echo "# the command line" >> $cross + if test -e "$source_path/.git" && \ + { test "$targetos" = linux || test "$targetos" = "windows"; }; then + echo 'werror = true' >> $cross + fi + echo "[project options]" >> $cross + if test "$SMBD" != ''; then + echo "smbd = $(meson_quote "$SMBD")" >> $cross + fi + + echo >> $cross echo "[binaries]" >> $cross echo "c = [$(meson_quote $cc $CPU_CFLAGS)]" >> $cross test -n "$cxx" && echo "cpp = [$(meson_quote $cxx $CPU_CFLAGS)]" >> $cross @@ -1818,14 +1811,12 @@ if test "$skip_meson" = no; then test "$default_feature" = no && meson_option_add -Dauto_features=disabled test "$static" = yes && meson_option_add -Dprefer_static=true test "$pie" = no && meson_option_add -Db_pie=false - test "$werror" = yes && meson_option_add -Dwerror=true # QEMU options test "$cfi" != false && meson_option_add "-Dcfi=$cfi" "-Db_lto=$cfi" test "$docs" != auto && meson_option_add "-Ddocs=$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test "$plugins" = yes && meson_option_add "-Dplugins=true" - test "$smbd" != '' && meson_option_add "-Dsmbd=$smbd" test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg" run_meson() { NINJA=$ninja $meson setup "$@" "$PWD" "$source_path" diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 0c24bdc1e8c..2e88732a291 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -28,7 +28,6 @@ SKIP_OPTIONS = { "default_devices", "fuzzing_engine", - "smbd", } OPTION_NAMES = { @@ -47,6 +46,7 @@ # Options that configure autodetects, even though meson defines them as boolean AUTO_OPTIONS = { "plugins", + "werror", } BUILTIN_OPTIONS = { @@ -64,6 +64,7 @@ "prefix", "strip", "sysconfdir", + "werror", } LINE_WIDTH = 76 diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index e1522030619..dec33820163 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -64,6 +64,7 @@ meson_options_help() { printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' printf "%s\n" ' --mandir=VALUE Manual page directory [share/man]' printf "%s\n" ' --prefix=VALUE Installation prefix [/usr/local]' + printf "%s\n" ' --smbd=VALUE Path to smbd for slirp networking' printf "%s\n" ' --sysconfdir=VALUE Sysconf data directory [etc]' printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string' printf "%s\n" ' [NORMAL]' @@ -205,6 +206,7 @@ meson_options_help() { printf "%s\n" ' vpc vpc image format support' printf "%s\n" ' vte vte support for the gtk UI' printf "%s\n" ' vvfat vvfat image format support' + printf "%s\n" ' werror Treat warnings as errors' printf "%s\n" ' whpx WHPX acceleration support' printf "%s\n" ' xen Xen backend support' printf "%s\n" ' xen-pci-passthrough' @@ -453,6 +455,7 @@ _meson_option_parse() { --disable-slirp-smbd) printf "%s" -Dslirp_smbd=disabled ;; --enable-smartcard) printf "%s" -Dsmartcard=enabled ;; --disable-smartcard) printf "%s" -Dsmartcard=disabled ;; + --smbd=*) quote_sh "-Dsmbd=$2" ;; --enable-snappy) printf "%s" -Dsnappy=enabled ;; --disable-snappy) printf "%s" -Dsnappy=disabled ;; --enable-sndio) printf "%s" -Dsndio=enabled ;; @@ -529,6 +532,8 @@ _meson_option_parse() { --disable-vte) printf "%s" -Dvte=disabled ;; --enable-vvfat) printf "%s" -Dvvfat=enabled ;; --disable-vvfat) printf "%s" -Dvvfat=disabled ;; + --enable-werror) printf "%s" -Dwerror=true ;; + --disable-werror) printf "%s" -Dwerror=false ;; --enable-whpx) printf "%s" -Dwhpx=enabled ;; --disable-whpx) printf "%s" -Dwhpx=disabled ;; --enable-xen) printf "%s" -Dxen=enabled ;; From patchwork Wed Oct 18 08:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UzT32DHr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PGr15V3z20Pd for ; Wed, 18 Oct 2023 19:32:20 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vc-0002sO-BU; Wed, 18 Oct 2023 04:29:23 -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 1qt1v8-00020b-F4 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:51 -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 1qt1v6-0003hh-Sh for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617728; 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=HByuZthEG86fBBuYqJCXFDeyXnbIS8dEpfmL1flA5kg=; b=UzT32DHrbmi+JqBgDi2mI+q+eNANdDb6cKnjonQ5qfAfcp3N4UuccwPA6NOPYcJWUKAkyT G7EHtW20azygJzwRHCRlE5Ml1ppHlUODkqubNY+pRD4Y1RThBO1E6hpl7PjdULq6VBcWAQ L2lNXZosNNZTnC8v17vpFu4+GU0zaf8= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-bXSvAEylPzqnyGMCUYg08Q-1; Wed, 18 Oct 2023 04:28:46 -0400 X-MC-Unique: bXSvAEylPzqnyGMCUYg08Q-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-99bca0b9234so271150266b.2 for ; Wed, 18 Oct 2023 01:28:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617725; x=1698222525; 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=HByuZthEG86fBBuYqJCXFDeyXnbIS8dEpfmL1flA5kg=; b=xI2D2zk88YVW7ESy1gN9fPztDAH2KiMAGcPa/o61E5cy+iBoccisr7zZlHnd24hsTh 9TX3uJ391v8WyNHoZsgdZWNnFvlM/8VYgzCLjvrz41itmBA3s90IQ/DqgKIBBztLSYtT 86BFpDZ3miyT8Q4zSnb8NkumAxD+6oEf5dXQR5WFBXzk9xbyjmeSsX3rC7PcKXIUHvys 7PIoEQV4tUR3Lbm4ytILimKdX5r6FonV1GiJVtE7ciBg+p6fk2K0Gbdzt/UOz/Ek6xWH nXEtCDbz05r5UFzrsABe/F78UxzPCq7sRBWMXPWE92068MdC6VjTWLX9OubT7GHqgt2l UUKw== X-Gm-Message-State: AOJu0YzJd7AsiPb2Po+qmLF8PnoqVNIBQsKlHVUwIofubibvDAvKrONj dTBynoV/KeN+bwRhfVDWEPXcsOQYaoXlepaRi6j0cGyR7sgYC6vD/4jLYqj2yloiufTrHteWDVQ RLNbPHkcgL0jPfThjOiJFcTC4VcrRcQmkxDeaQ+Zr4VwLOnsOHmCt3287svk6m8R95Pjwy7L7Wb s= X-Received: by 2002:a17:907:7f23:b0:9b2:982e:339a with SMTP id qf35-20020a1709077f2300b009b2982e339amr3121268ejc.22.1697617725331; Wed, 18 Oct 2023 01:28:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxicI5qaKHL//XioM5hXnJrEkRGKFlbjp9HqbWFIEkAYUJUl5yg4hoGvEtK9UMIzvwMFJdeQ== X-Received: by 2002:a17:907:7f23:b0:9b2:982e:339a with SMTP id qf35-20020a1709077f2300b009b2982e339amr3121257ejc.22.1697617725021; Wed, 18 Oct 2023 01:28:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id dc12-20020a170906c7cc00b009a1dbf55665sm1160257ejb.161.2023.10.18.01.28.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 28/32] configure: unify handling of several Debian cross containers Date: Wed, 18 Oct 2023 10:27:48 +0200 Message-ID: <20231018082752.322306-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The Debian and GNU architecture names match very often, even though there are common cases (32-bit Arm or 64-bit x86) where they do not and other cases in which the GNU triplet is actually a quadruplet. But it is still possible to group the common case into a single case inside probe_target_compiler. Signed-off-by: Paolo Bonzini --- configure | 41 +++++------------------------------------ 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 200570a3d18..4b24c572d56 100755 --- a/configure +++ b/configure @@ -1281,10 +1281,6 @@ probe_target_compiler() { container_cross_prefix=aarch64-linux-gnu- container_cross_cc=${container_cross_prefix}gcc ;; - alpha) - container_image=debian-alpha-cross - container_cross_prefix=alpha-linux-gnu- - ;; arm) # We don't have any bigendian build tools so we only use this for ARM container_image=debian-armhf-cross @@ -1299,10 +1295,6 @@ probe_target_compiler() { container_cross_prefix=hexagon-unknown-linux-musl- container_cross_cc=${container_cross_prefix}clang ;; - hppa) - container_image=debian-hppa-cross - container_cross_prefix=hppa-linux-gnu- - ;; i386) container_image=fedora-i386-cross container_cross_prefix= @@ -1311,10 +1303,6 @@ probe_target_compiler() { container_image=debian-loongarch-cross container_cross_prefix=loongarch64-unknown-linux-gnu- ;; - m68k) - container_image=debian-m68k-cross - container_cross_prefix=m68k-linux-gnu- - ;; microblaze) container_image=debian-microblaze-cross container_cross_prefix=microblaze-linux-musl- @@ -1327,14 +1315,6 @@ probe_target_compiler() { container_image=debian-mips64-cross container_cross_prefix=mips64-linux-gnuabi64- ;; - mipsel) - container_image=debian-mipsel-cross - container_cross_prefix=mipsel-linux-gnu- - ;; - mips) - container_image=debian-mips-cross - container_cross_prefix=mips-linux-gnu- - ;; nios2) container_image=debian-nios2-cross container_cross_prefix=nios2-linux-gnu- @@ -1349,22 +1329,6 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; - riscv64) - container_image=debian-riscv64-test-cross - container_cross_prefix=riscv64-linux-gnu- - ;; - s390x) - container_image=debian-s390x-cross - container_cross_prefix=s390x-linux-gnu- - ;; - sh4) - container_image=debian-sh4-cross - container_cross_prefix=sh4-linux-gnu- - ;; - sparc64) - container_image=debian-sparc64-cross - container_cross_prefix=sparc64-linux-gnu- - ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- @@ -1379,6 +1343,11 @@ probe_target_compiler() { # default to the dc232b cpu container_cross_prefix=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf- ;; + *) + # Debian and GNU architecture names usually match + container_image=debian-$target_arch-cross + container_cross_prefix=$target_arch-linux-gnu- + ;; esac : ${container_cross_cc:=${container_cross_prefix}gcc} : ${container_cross_ar:=${container_cross_prefix}ar} From patchwork Wed Oct 18 08:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Y8P2PaQl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PF46RXDz20Pd for ; Wed, 18 Oct 2023 19:30:48 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vF-0002F4-B7; Wed, 18 Oct 2023 04:28:57 -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 1qt1vA-00022q-MU for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28: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 1qt1v8-0003i2-W6 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617730; 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=E9rNqaVK84tFYCTSHv5gjYxAT3A3NUnYvaGZa77NGgM=; b=Y8P2PaQl+drDSUc+rwJ8mg9i+QIdxHiDDuPJzqf3ZnikwYbgUybkEFvqI2gEL0PKCR+SDB kBAjLnW6buGs6HdYEMU3gyfOXJUgDA2wfbaNxk1zuYnDinosN/IOvkUpD2wkfNKQ5KKjik 8ONQhMicUQumsxPikPvtOhhAPEFS4z8= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-KHEisyLdMzO-ByZJW6UtAw-1; Wed, 18 Oct 2023 04:28:49 -0400 X-MC-Unique: KHEisyLdMzO-ByZJW6UtAw-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9b274cc9636so486269266b.0 for ; Wed, 18 Oct 2023 01:28:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617727; x=1698222527; 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=E9rNqaVK84tFYCTSHv5gjYxAT3A3NUnYvaGZa77NGgM=; b=I0/MXHpFZCd4HcpGcpVtqlMG21+xtDTrxYy4XDENI0xNahuDrccBH47RT6qb3vrNqX RBL2+RRJ3MofI9WaZ+PyeJ7XSKuduKtxTVwcYtZw0fWTA4Y/cVVFn8WgDATW0pfgth1X egoFsKPGCGm9O7A1sUNrZGHMaBujEgCGh2KDAM7BZ3qZJ5Q80pcQSRy1+wDQpnh4Q71D S6RH04Zf95GooBq2YFUCrxscjrAYrxLZtpxxSBQf0fIY+kKTci/3ecPZogbXfsnQ3ZNc /eVe580jZ/CfO7R/SmU73nx1RppUnfZkXoil3Q5px2XOUb27pPqhZyWUdxFAxkvjVG9B dARw== X-Gm-Message-State: AOJu0YyaqtnOrzM0zy2oaW5UoTXTkR7sCRhFarIuDZutyBz7y0HtcZ2W NVXPwg1z8H8CAXUsw1wCTFQzWybrsCHbCNeobc5X6D33ZsUodFOxI5JeUZouyepSpQ/WyEOP41S 1AihVyAo4SpZrx6YaHHJKlBf1FvUY0rscoWJszouPr5i6Jm0kd7UGyAopCkbIM9JiG4IRQLjp37 k= X-Received: by 2002:a17:907:7d8c:b0:9a1:f81f:d0d5 with SMTP id oz12-20020a1709077d8c00b009a1f81fd0d5mr3362408ejc.54.1697617727488; Wed, 18 Oct 2023 01:28:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMfwxXGsP1mGB/Ewn+1WASfg0h64QYlqOwwNV4RtXOy86kx/YX6TpUod4OoSzLxpkhAi//2g== X-Received: by 2002:a17:907:7d8c:b0:9a1:f81f:d0d5 with SMTP id oz12-20020a1709077d8c00b009a1f81fd0d5mr3362396ejc.54.1697617727128; Wed, 18 Oct 2023 01:28:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id n27-20020a1709062bdb00b009829d2e892csm1217660ejg.15.2023.10.18.01.28.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 29/32] configure, meson: use command line options to configure qemu-ga Date: Wed, 18 Oct 2023 10:27:49 +0200 Message-ID: <20231018082752.322306-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Preserve the functionality of the environment variables, but allow using the command line instead. Signed-off-by: Paolo Bonzini --- configure | 16 +++++++++------- meson_options.txt | 7 +++++++ qga/meson.build | 9 ++++++--- scripts/meson-buildoptions.sh | 9 +++++++++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4b24c572d56..8827a29bf4c 100755 --- a/configure +++ b/configure @@ -1592,12 +1592,6 @@ echo >> $config_host_mak echo all: >> $config_host_mak -if test "$targetos" = "windows"; then - echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak - echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO-Linux}" >> $config_host_mak - echo "QEMU_GA_VERSION=${QEMU_GA_VERSION-$(cat "$source_path"/VERSION)}" >> $config_host_mak -fi - echo "SRC_PATH=$source_path" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak echo "GDB=$gdb_bin" >> $config_host_mak @@ -1724,6 +1718,15 @@ if test "$skip_meson" = no; then if test "$SMBD" != ''; then echo "smbd = $(meson_quote "$SMBD")" >> $cross fi + if test "${QEMU_GA_MANUFACTURER}" != ''; then + echo "qemu_ga_manufacturer = $(meson_quote "${QEMU_GA_MANUFACTURER}")" >> $cross + fi + if test "${QEMU_GA_DISTRO}" != ''; then + echo "qemu_ga_distro = $(meson_quote "${QEMU_GA_DISTRO}")" >> $cross + fi + if test "${QEMU_GA_VERSION}" != ''; then + echo "qemu_ga_version = $(meson_quote "${QEMU_GA_VERSION}")" >> $cross + fi echo >> $cross echo "[binaries]" >> $cross @@ -1775,7 +1778,6 @@ if test "$skip_meson" = no; then rm -rf meson-private meson-info meson-logs - # Built-in options test "$download" = "disabled" && meson_option_add "--wrap-mode=nodownload" test "$default_feature" = no && meson_option_add -Dauto_features=disabled test "$static" = yes && meson_option_add -Dprefer_static=true diff --git a/meson_options.txt b/meson_options.txt index e237b268469..1b0c02b4a58 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -353,5 +353,12 @@ option('qom_cast_debug', type: 'boolean', value: true, option('slirp_smbd', type : 'feature', value : 'auto', description: 'use smbd (at path --smbd=*) in slirp networking') +option('qemu_ga_manufacturer', type: 'string', value: 'QEMU', + description: '"manufacturer" name for qemu-ga registry entries') +option('qemu_ga_distro', type: 'string', value: 'Linux', + description: 'second path element in qemu-ga registry entries') +option('qemu_ga_version', type: 'string', value: '', + description: 'version number for qemu-ga installer') + option('hexagon_idef_parser', type : 'boolean', value : true, description: 'use idef-parser to automatically generate TCG code for the Hexagon frontend') diff --git a/qga/meson.build b/qga/meson.build index 59cae0cc6ee..940a51d55db 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -145,6 +145,9 @@ if targetos == 'windows' else libpcre = 'libpcre2' endif + qga_msi_version = get_option('qemu_ga_version') == '' \ + ? project.version() \ + : get_option('qemu_ga_version') qga_msi = custom_target('QGA MSI', input: files('installer/qemu-ga.wxs'), output: 'qemu-ga-@0@.msi'.format(host_arch), @@ -155,9 +158,9 @@ if targetos == 'windows' qemu_ga_msi_vss, '-D', 'BUILD_DIR=' + meson.project_build_root(), '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'), - '-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'], - '-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'], - '-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'], + '-D', 'QEMU_GA_VERSION=' + qga_msi_version, + '-D', 'QEMU_GA_MANUFACTURER=' + get_option('qemu_ga_manufacturer'), + '-D', 'QEMU_GA_DISTRO=' + get_option('qemu_ga_distro'), '-D', 'LIBPCRE=' + libpcre, ]) all_qga += [qga_msi] diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index dec33820163..bda88993bd1 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -64,6 +64,12 @@ meson_options_help() { printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' printf "%s\n" ' --mandir=VALUE Manual page directory [share/man]' printf "%s\n" ' --prefix=VALUE Installation prefix [/usr/local]' + printf "%s\n" ' --qemu-ga-distro=VALUE second path element in qemu-ga registry entries' + printf "%s\n" ' [Linux]' + printf "%s\n" ' --qemu-ga-manufacturer=VALUE' + printf "%s\n" ' "manufacturer" name for qemu-ga registry entries' + printf "%s\n" ' [QEMU]' + printf "%s\n" ' --qemu-ga-version=VALUE version number for qemu-ga installer' printf "%s\n" ' --smbd=VALUE Path to smbd for slirp networking' printf "%s\n" ' --sysconfdir=VALUE Sysconf data directory [etc]' printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string' @@ -422,6 +428,9 @@ _meson_option_parse() { --enable-qed) printf "%s" -Dqed=enabled ;; --disable-qed) printf "%s" -Dqed=disabled ;; --firmwarepath=*) quote_sh "-Dqemu_firmwarepath=$(meson_option_build_array $2)" ;; + --qemu-ga-distro=*) quote_sh "-Dqemu_ga_distro=$2" ;; + --qemu-ga-manufacturer=*) quote_sh "-Dqemu_ga_manufacturer=$2" ;; + --qemu-ga-version=*) quote_sh "-Dqemu_ga_version=$2" ;; --with-suffix=*) quote_sh "-Dqemu_suffix=$2" ;; --enable-qga-vss) printf "%s" -Dqga_vss=enabled ;; --disable-qga-vss) printf "%s" -Dqga_vss=disabled ;; From patchwork Wed Oct 18 08:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hdrsvpi0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PCN28Rzz20Zj for ; Wed, 18 Oct 2023 19:29:20 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vN-0002VK-Oi; Wed, 18 Oct 2023 04:29:05 -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 1qt1vC-0002BU-8b for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:55 -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 1qt1vA-0003iC-MZ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617732; 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=Hhz5NoA8No/Gwx+ZeOtjgQ6Cuap6+7hqMf6Rp4/O1Yk=; b=hdrsvpi0WYiHf/ao4OAhSR5TtN0xZ0L4gsY/Sa8MXjvNWCKaRLFfJjS0J1xpuSxDsM0GA4 CLNz4hEWF08KsUC3zw+8CKKSl77sKlOLdn+PuvFbUgq4bDT0rFi4wxQ5MQ4Km/BuHy376u CUYxZUw0t3eIRq2HSu258fdjqgmE29o= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-ZWFP1KLzMP-DlDrq7z7xew-1; Wed, 18 Oct 2023 04:28:50 -0400 X-MC-Unique: ZWFP1KLzMP-DlDrq7z7xew-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9b822f5c156so482509166b.3 for ; Wed, 18 Oct 2023 01:28:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617729; x=1698222529; 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=Hhz5NoA8No/Gwx+ZeOtjgQ6Cuap6+7hqMf6Rp4/O1Yk=; b=LjgH4VxpFfpBnPwgmEntgYXdoGQWxezCNcPylfD0mLUdYWhL6tmF1VeFUywDAqprUy ofSDJ0m9T4FJi1mjelSZwjmDTnxSV4caIPqyxE0ZzaRDnMsriJGl8+fzQ2uwmYH6vmHK sSaY2qwzyhiBE0aYaJwEgOZIMP0tgu2C/LgSjBiyqMAw1Vbs70GdBFPax5TWTpqriY7e EDcdQGRFZtb08vWVUs1cTLI/U2PMcHtPtjZbqjs9qgjuDNZhQDGNdC85zh51+OpgXlwJ OHJTU61GQzHUA9FItJpTu2O2JqKJNsgFjIGITQflA6raf7sh1qV2C5i84BAvBJUORlLh f/Lw== X-Gm-Message-State: AOJu0YynunYFhhpo+W4glsHiauZnWweU7LKIH1M/V9X5R3STaxjOOvh0 Yd7ft5cewJID7UJyhllLXjC0mDmsBPnnTszXleYmk2kesbbl/PqgAK7zyOUynYTJ2rAIDKWvXF+ xQKQaibDnixsQT69RuQiPcbpvy4OW1zwNUvEHivyGT/y30Z7zYXKcjg72vN9+ieZzAGq2d2huIM o= X-Received: by 2002:a17:907:6ea8:b0:9c4:b8c9:1bf4 with SMTP id sh40-20020a1709076ea800b009c4b8c91bf4mr3994345ejc.19.1697617729019; Wed, 18 Oct 2023 01:28:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwjcHKxxywjM/JYalw+fIB+w5uPB0G58JVCafeJFk895OP+ZeDdCrwGzK+g4NCP87KuyriKg== X-Received: by 2002:a17:907:6ea8:b0:9c4:b8c9:1bf4 with SMTP id sh40-20020a1709076ea800b009c4b8c91bf4mr3994335ejc.19.1697617728709; Wed, 18 Oct 2023 01:28:48 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id k19-20020a170906579300b0099bd5d28dc4sm1179698ejq.195.2023.10.18.01.28.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 30/32] meson-buildoptions: document the data at the top Date: Wed, 18 Oct 2023 10:27:50 +0200 Message-ID: <20231018082752.322306-31-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 2e88732a291..4814a8ff61f 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -25,11 +25,15 @@ import shlex import sys +# Options with nonstandard names (e.g. --with/--without) or OS-dependent +# defaults. Try not to add any. SKIP_OPTIONS = { "default_devices", "fuzzing_engine", } +# Options whose name doesn't match the option for backwards compatibility +# reasons, because Meson gives them a funny name, or both OPTION_NAMES = { "b_coverage": "gcov", "b_lto": "lto", @@ -49,6 +53,10 @@ "werror", } +# Builtin options that should be definable via configure. Some of the others +# we really do not want (e.g. c_args is defined via the native file, not +# via -D, because it's a mix of CFLAGS and --extra-cflags); for specific +# cases "../configure -D" can be used as an escape hatch. BUILTIN_OPTIONS = { "b_coverage", "b_lto", From patchwork Wed Oct 18 08:27:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Mwl1xyOS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PF72gqSz20Pd for ; Wed, 18 Oct 2023 19:30:51 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vk-00032R-3v; Wed, 18 Oct 2023 04:29:29 -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 1qt1vD-0002F5-Tl for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:57 -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 1qt1vC-0003iU-FS for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617733; 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=rTWaNH6l64cXT7uyRdZIns6tQsnLs5740jLL/+6gUsg=; b=Mwl1xyOSMpHkVCM04ASsoLNLSFKgMFZnVgDoAoeaDPbJMu/YQuyqvtGKXcU8CtVQrly638 H1Az26TFPq1FCvS8g5utFZl5WDehfn5SKdhWWnggYK1g32kpaUvCjYgrZbucLjedos9XD8 ZPEHE3mejNmRk882+5aKJizkWA41wMQ= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-Yc4Dfm8GMB6kMfn3KAO0vw-1; Wed, 18 Oct 2023 04:28:52 -0400 X-MC-Unique: Yc4Dfm8GMB6kMfn3KAO0vw-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-53e2acda9d6so4444189a12.2 for ; Wed, 18 Oct 2023 01:28:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617730; x=1698222530; 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=rTWaNH6l64cXT7uyRdZIns6tQsnLs5740jLL/+6gUsg=; b=dORM8swGPmtdmCt/ZR4NIRPsyReiLk+l1WXovcj4meVg50z77aTj7z6s9pHw4mN3jS G6BAFTErOO9J5JGrn0ZoToIAQ8CTXQAI79WGKZBTYj5GDPw4YPutU2MvQka5VYK2L641 oa2VbdfoVGJ9T2YM/niMVolIsIaoIxvPOxcAg48c57DH+fx+rbzQHjxGmAUKA4unsMlj 5bxFUuQ7l++0kygLWVuxi5bdoOWHovJYdaE70jjXFWGBmeGUod2LYT6I+DHKhFpIWFUL 5X7ujnPWwt0hClg3VeqBzg7EEOz7MOkmB331CLnXr0C8twxRQ42v2/xKuFKP9Kf22PyH Q15g== X-Gm-Message-State: AOJu0Yy057KY/bUSt/Pw1qHwg0F79GOTKScehkDQ9DQd2tQTlmjR7BDt xMx9P1XT3SjZ57sZkRuidqWaVI0Tn1z24Mo2neIe1HzThh1DfaJRdJwng1rDmHr6gz/8c5oFldZ hq3L221oodmgYpO3P/zXvBMWvmK6rgW2VgEi9ivdUdUwVF52qBUwcKPZ4HBwBA25qsHtU+hlZZq o= X-Received: by 2002:a05:6402:51d4:b0:53d:eca8:8775 with SMTP id r20-20020a05640251d400b0053deca88775mr3721521edd.26.1697617730494; Wed, 18 Oct 2023 01:28:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhxn+bTkMYbGUa3sJBqoTRRh7qE3Agy7oMBZYYwRtmTLOQI2smdb+ZgN4Sc4XE1rpWCRD++w== X-Received: by 2002:a05:6402:51d4:b0:53d:eca8:8775 with SMTP id r20-20020a05640251d400b0053deca88775mr3721507edd.26.1697617730172; Wed, 18 Oct 2023 01:28:50 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id cw14-20020a056402228e00b0053e7809615esm2382600edb.80.2023.10.18.01.28.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 31/32] meson: add a note on why we use config_host for program paths Date: Wed, 18 Oct 2023 10:27:51 +0200 Message-ID: <20231018082752.322306-32-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index 2bda62a2b1b..0182622aede 100644 --- a/meson.build +++ b/meson.build @@ -4021,6 +4021,11 @@ summary(summary_info, bool_yn: true, section: 'Directories') summary_info = {} summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())} summary_info += {'sphinx-build': sphinx_build} + +# FIXME: the [binaries] section of machine files, which can be probed +# with find_program(), would be great for passing gdb and genisoimage +# paths from configure to Meson. However, there seems to be no way to +# hide a program (for example if gdb is too old). if config_host.has_key('GDB') summary_info += {'gdb': config_host['GDB']} endif From patchwork Wed Oct 18 08:27:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1850618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OPLAySYp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9PH50CKyz20Pd for ; Wed, 18 Oct 2023 19:32:33 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1vv-0003VV-IS; Wed, 18 Oct 2023 04:29:39 -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 1qt1vF-0002GC-Fg for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28: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 1qt1vD-0003if-Ok for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:28:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ebBCBXqpGdgbZayh/BtrGgAprkQWgdMqUBQV4ATPtWI=; b=OPLAySYpnJ8sf5CK61dQt/uPVlbVrzZ/WpctUyjMcQKerkE5ABREX1H5eeKOaEDpU3x6Ub OrebetL5OdXGI72O4fW6xF0uThJR51sjbWkiTr0iHw1jcFrHC2DHXkWoAuCqp9GXpJKRYD h42EOeJOTrd66/jE2089vpzqlQ3RWYw= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-ViUeEOKvMeqbrRHUhQINNw-1; Wed, 18 Oct 2023 04:28:53 -0400 X-MC-Unique: ViUeEOKvMeqbrRHUhQINNw-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9c4485166beso214109166b.3 for ; Wed, 18 Oct 2023 01:28:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617732; x=1698222532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ebBCBXqpGdgbZayh/BtrGgAprkQWgdMqUBQV4ATPtWI=; b=Hvqds/OhmMe9QRCWK74QoJyIncifM+dx9RxnIT434ADJ2/KWhWvIM8WWWob+FN+NbR Mn6IxfKFh6f8eBA0kXuOkrjQ+K0q8i7ADSnuH4E0cQW65kCcnqy7uAG+EYHSP3VuykJz uRV9ngbJ7DUMEIGukMe2Q1G1tVIk/NStt+5rUNMc20OVVfjLcyS68wHMf2AeghqHi1my 3igLilH6J+qJK4R5fHX4TuwNINPy0eePw8cWcyQ/iPZGRoRlZShjOvc8rlvUg0hgF4w0 PJLEjqIcEcn5C63zvvw2W/4IovdXy3V6Y7GDz1OxO9DcUeck1pjxPyxF65DYxGzigbEc 3pKQ== X-Gm-Message-State: AOJu0YzqiL1zvjPS8hDLavewj6NfiB+nRPOuLwafqJ2CE7D5GGB9RlUm yuUms3dWNEdeXlg+FMDyIclmaXysf/clv4LvjbyPYZ+gUFUuoNJ4rpdrGgVfL+DU8TPQV2dyO9u EF0xMKNpJjYsuNRkIaylOCN+C7RcV4b+ZDStBL+3NQV2Z1zWtV3fsPb1i6bMsl6NkD+XGuBwzki 4= X-Received: by 2002:a17:907:7e98:b0:9be:30c2:b8ff with SMTP id qb24-20020a1709077e9800b009be30c2b8ffmr2932740ejc.61.1697617732124; Wed, 18 Oct 2023 01:28:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFe9fkcdof0ylilG63bD19vvuwWKSVHhXBW/Lj23/WFgoqPwQs7v3SmI+DiiACE5X2NaOPzeA== X-Received: by 2002:a17:907:7e98:b0:9be:30c2:b8ff with SMTP id qb24-20020a1709077e9800b009be30c2b8ffmr2932731ejc.61.1697617731815; Wed, 18 Oct 2023 01:28:51 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d1-20020a1709063ec100b009bf94de8971sm1186412ejj.70.2023.10.18.01.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth Subject: [PULL 32/32] configure: define "pkg-config" in addition to "pkgconfig" Date: Wed, 18 Oct 2023 10:27:52 +0200 Message-ID: <20231018082752.322306-33-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-1-pbonzini@redhat.com> MIME-Version: 1.0 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Meson used to allow both "pkgconfig" and "pkg-config" entries in machine files; the former was used for dependency lookup and the latter was used as return value for "find_program('pkg-config')", which is a less common use-case and one that QEMU does not need. This inconsistency is going to be fixed by Meson 1.3, which will deprecate "pkgconfig" in favor of "pkg-config" (the less common one, but it makes sense because it matches the name of the binary). For backward compatibility it is still allowed to define both, so do that in the configure-generated machine file. Related: https://github.com/mesonbuild/meson/pull/12385 Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 8827a29bf4c..b4ea78c77d8 100755 --- a/configure +++ b/configure @@ -1736,6 +1736,7 @@ if test "$skip_meson" = no; then echo "ar = [$(meson_quote $ar)]" >> $cross echo "nm = [$(meson_quote $nm)]" >> $cross echo "pkgconfig = [$(meson_quote $pkg_config)]" >> $cross + echo "pkg-config = [$(meson_quote $pkg_config)]" >> $cross echo "ranlib = [$(meson_quote $ranlib)]" >> $cross if has $sdl2_config; then echo "sdl2-config = [$(meson_quote $sdl2_config)]" >> $cross