From patchwork Fri Nov 24 15:24:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746807 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1568653wru; Fri, 24 Nov 2023 07:26:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyX1zZnIwRPKn4OFsyyq5l4jptIe0VaMp+deGTwZvVJMEw/0Vm5In1ZQfJNnYoS/6KdwHZ X-Received: by 2002:a05:6358:6f87:b0:16d:be35:2e9d with SMTP id s7-20020a0563586f8700b0016dbe352e9dmr3190354rwn.24.1700839574209; Fri, 24 Nov 2023 07:26:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700839574; cv=none; d=google.com; s=arc-20160816; b=OZvptm8AC1c7qHpQgAf7Bqo1HiwpqLA5gO46rKwUGLEh+VEnBuDA2i0pcdbECO84oT DD2CLWEZJEecEKdeZmBynuK1t86FElW4ZWjHkZHdkDLUQoY5wVtkavE5QZ9wCmCvfSx9 yYPvC80Ckys7o8HZDDLEDTy2MswL+rgEsE1MA1rm8tKJVCe1/XR6s3rV/9Dnaeakzq6p GVy7I5c5VblP/IzXmQ4HmRD3JbSDSO2S1A58k+gtqVG5mvvYw95YOskPyhXFcK60rrUL LUjJmfR8/7BVe3eJYJs1fjhCOsnTaL30Ib8Svd1r5z9w8S1NKGkFFouwIRD0GVgNpP3e Ocdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=MvF93qzVHGK0eLkUi0U1zEEltb4xkJGSWHDIx0M3EjMBASxInWxbI3zFoFel/FYbkI WGNGcXi+82ARWsOXbkKogsl/8ofZLYbeQKTjvasjHLJ8SKbmFoxcVcX6L8IFaQlJLtXt kaTXPi1/Y0O/JoN7YFsIXQSOYHKJClzRyvoPmmDd5BX4hq/U6kB7HKOoEGNvGwSyRYYb skhnwBDXDWArErNSmgGM+8EI18ithIvoQlmQaHVFB+6VAEhUUolPbif9XxBllOF0wwtW Ix2b1a/EEGvex62+G/HENYvRU01Y/NJMa3zj91KQf4NtUvovcyaWI/z8MNqpq0ylERwq F5tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XLLlpZk5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c187-20020a1fccc4000000b0048fc4d5f5cdsi924650vkg.44.2023.11.24.07.26.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 07:26:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XLLlpZk5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2c-0004fu-FH; Fri, 24 Nov 2023 10:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2a-0004fW-TU for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:24 -0500 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 1r6Y2Z-00049y-8X for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839462; 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=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; b=XLLlpZk5L/vUjZ/Ks5CD1obDn62DHzA8ySeI6fKLmpHCabUCUtqDe0GxCtOnvhiMSFkZ2A +t2J+rSkIG4yH1FPo7Oc6ol67bdj7if+QnsWxw1gcVEQDj60E2fXV+ABlbd5jsvjg1AP1S mOOHdsuk0GcWssrv4F+fKyQRiBVxeNs= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-dlc5gImoPQWEwF1TmUCGow-1; Fri, 24 Nov 2023 10:24:21 -0500 X-MC-Unique: dlc5gImoPQWEwF1TmUCGow-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42387bd2759so27268301cf.2 for ; Fri, 24 Nov 2023 07:24:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839460; x=1701444260; 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=FQQMgvxF9SwBnwwizEGgyfuBASfZamZJpC63FmNxYDo=; b=oF2yyBW+1BjEtWFiQQPHSfppZBfcBxguM14bHW6AvOoTBKchgwVEn0lBkpjjBka0fU 6z6084M9SZOeOMIXhDTkMPm5UT/f7fATA9COehwB/lyTjMEMwhNd8t84vLkTJqMXSvCd 0Qahcu9Zc9l3Jy0JTAu3ndKUZX4tqUt+UNyvI/oXWBPehx675FpkOdftOM55uvuoNWuQ 67CS6CbnsJ51hG8eFNj2hkZ/vRaE0KpBfwtL61lJBZFyL9JG+7kdOc7lqgYd04pjWGIP YylDTSKCGUn4g7tEWMxaoaXfFt1UgEZHmqvn2T+7riYFVG4YfYGS5FoxpFUPEc6pW9+c RtJw== X-Gm-Message-State: AOJu0Yz8CxN8pK0fb//Jl3kqTgER79mKNzzP3aRz1V0LRrG+S+daBu3U 6rvEDNUkDLdyzejzu+RPO6rQA+jeL7qNz5hZvcKaD7EFsu9fZjIxC18BCYzSW2p00TLSj0P8s/c ZHM0cnTsv5noui/bVCIt/Un4ftreIg0I7j/BCHKpOt1nMmPvIamDw8/rw2tonnNnJja/PyKmHpY c= X-Received: by 2002:a05:622a:110:b0:423:6f53:75bb with SMTP id u16-20020a05622a011000b004236f5375bbmr4156538qtw.4.1700839460395; Fri, 24 Nov 2023 07:24:20 -0800 (PST) X-Received: by 2002:a05:622a:110:b0:423:6f53:75bb with SMTP id u16-20020a05622a011000b004236f5375bbmr4156495qtw.4.1700839459957; Fri, 24 Nov 2023 07:24:19 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id j16-20020ac86650000000b00423890096afsm1342747qtp.2.2023.11.24.07.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 04/10] buildsys: Bump known good meson version to v1.2.3 Date: Fri, 24 Nov 2023 16:24:02 +0100 Message-ID: <20231124152408.140936-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé We need meson v1.2.3 to build QEMU on macOS Sonoma. It also builds fine all our CI jobs (as tested by also bumping "accepted" in pythondeps.toml), so let's use it as our "good enough" packaged wheel. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1939 Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231109160504.93677-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- python/scripts/vendor.py | 4 ++-- python/wheels/meson-0.63.3-py3-none-any.whl | Bin 926526 -> 0 bytes python/wheels/meson-1.2.3-py3-none-any.whl | Bin 0 -> 964928 bytes pythondeps.toml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 python/wheels/meson-0.63.3-py3-none-any.whl create mode 100644 python/wheels/meson-1.2.3-py3-none-any.whl diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 76274871170..1038b14ae0c 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() packages = { - "meson==0.63.3": - "d677b809c4895dcbaac9bf6c43703fcb3609a4b24c6057c78f828590049cf43a", + "meson==1.2.3": + "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", "tomli==2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-0.63.3-py3-none-any.whl b/python/wheels/meson-0.63.3-py3-none-any.whl deleted file mode 100644 index 8a191e3a200eba6783297676729ec85ceb96f89d..0000000000000000000000000000000000000000 Binary files a/python/wheels/meson-0.63.3-py3-none-any.whl and /dev/null differ diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..a8b84e5f114ad3fbec8ae56008426a90bccfc168 Binary files /dev/null and b/python/wheels/meson-1.2.3-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 4beadfd96f5..0e884159993 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=0.63.0", installed = "0.63.3", canary = "meson" } +meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } [docs] sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" } From patchwork Fri Nov 24 15:24:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746806 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1568113wru; Fri, 24 Nov 2023 07:25:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoDegpu7T9yudr0OpnSDztpznfhi58U9lHX8HGiZlSt59NWCZkBu7f36I4KD43vmYbMO67 X-Received: by 2002:a05:620a:8d0a:b0:77d:582d:57ff with SMTP id rb10-20020a05620a8d0a00b0077d582d57ffmr2604468qkn.39.1700839528395; Fri, 24 Nov 2023 07:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700839528; cv=none; d=google.com; s=arc-20160816; b=ShNbOeU4caaNr0dMX37fB7e5yCrq+oAfvZuzH8GLStLX44J9M1uldbTugFtJ+ny/hW jKUht6TOGfBXQyf5yqY63tCqqRd/tZgOKIgz3x+cJ3CHQw2LIqMKTVxBV6MNF6Rjod6L E98dz4hK9GMZV0xWV7Dd5tAUaF5BiB5FJhkEll9IsZM9Q8CtTJsMFezcG6s1KrZ6sBiY 4sj+5P1/z4foXeiTWzd+ToXM4AoJSaI0sBEtdOWaUclfnuTRGf4aoZN3eQtziykNPFo5 5y9gLT8wY9qwapPsl9HCTll8y1mGwhf8cbywsOUK1/WWCvfQYhO1/yIeG4mTGro+7YNc GqZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=cIV/7vE0bw2A4L32KYQ2QsTDZuvbIVcfsQ6zvz0xwqwASbnRd5IaQHg4TbP1BcIvtz +eiG2KdrmUTLlnRcjhxEkEoyx71fb4UvNlAKXQnSGtUER0NM/m+oX0xlfCzZcQaKOyio rOOwv/qd5BIJ3ur+7p4TjwAfoQ3MYCkMWGnv5p3YkqsFg/MKzLWwM+LnLjxB9+E2U2GX 39l262iJ1/e6EmRoOOh7q/jk/6gedl4FMtqQxxgnBKjWrxEPmoo7n33ALOkROuLqKmgo WnvTm35c8IeDZf3Arbk9Cj3yc1TCwQ0vIPhmHhphe/H+v/IoPls7OidYZFooG3UkrgSJ cx4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bVFbowtO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id em5-20020ad44f85000000b00677a10d3bafsi3430413qvb.132.2023.11.24.07.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 07:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bVFbowtO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2e-0004go-W7; Fri, 24 Nov 2023 10:24:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2d-0004gZ-N5 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:27 -0500 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 1r6Y2c-0004Ad-0d for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839465; 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=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; b=bVFbowtO+/Anhqqb/MO+r45LxJN3Ot2bM9s+OBhFz0XqoSa4dO2XQauz/4elWSZ7uOjK5S DmX1+/yCFPumOjbLauYnTvp/0jN1gbxM2wl6sMchPBxmgTIHNM6c4tOhPRWHyMOYyp+8Gp qCj9OvSJPtw+0UVlQ5EtuqG1d++0eAo= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-P8Ox6sp-OzCRvj2q3AcBHQ-1; Fri, 24 Nov 2023 10:24:24 -0500 X-MC-Unique: P8Ox6sp-OzCRvj2q3AcBHQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-679f5ae0a7fso21307086d6.1 for ; Fri, 24 Nov 2023 07:24:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839463; x=1701444263; 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=/20DDByM3Qsjva1Qthl5NkPrrLu3hCoWgmP4Oz1sqnY=; b=Bm3prhl7RABdlgekT46PEnqh5I0O0zCKuPTXWkMd/Xf16Gr14SXiBenoLpLXDWGKoK B13/WbGpKwkA7TbtOXAVlMvSBoDEr5xp5bP0rkyxkfGlSHuUXytf0kfDZI7XoXpygMVY /nMBqTRfW7oitmwnXOl0Kr5rKTRR8LzlnhGVL6OekyH0bovYy3uzjpexi5OLl8kfENcz xYqX3+nXmmX2DrtBSgc5vDl1uRo7gGBcyHvSc+VedommHjO8zAzaLJOzJ1sguzYwiaFD mvs0qUwZUK0qbmsiwHmkB9GAvnNNEOjCEtxximH8Kq/CX0TD+HqJx9OHpBkZcmiKkl6S ZBOw== X-Gm-Message-State: AOJu0YxJrr5vbZFyEnQ4o5uoW1cpVhZWnpa+qMyJ5VNqIRMy5KbYwj/W lg9OsPriNDEC5AzaGz8IqVxrCGcZgSBs0NLIHuRhfjiP1Bydr4LqOWt4/vgPEuaT3lBegH/1B79 hkfcX7CX6fM6AFgdFqZBPv92fW8m7B4n06LScJ2gTXvX8ZOUu7iJcwEhN6zVh9yp/iHbyUej8A/ Y= X-Received: by 2002:a05:6214:1fd0:b0:679:e3e1:a9bd with SMTP id jh16-20020a0562141fd000b00679e3e1a9bdmr3184357qvb.33.1700839463094; Fri, 24 Nov 2023 07:24:23 -0800 (PST) X-Received: by 2002:a05:6214:1fd0:b0:679:e3e1:a9bd with SMTP id jh16-20020a0562141fd000b00679e3e1a9bdmr3184329qvb.33.1700839462665; Fri, 24 Nov 2023 07:24:22 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id p4-20020a05621415c400b0067a17f65a9csm531040qvz.21.2023.11.24.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 05/10] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Date: Fri, 24 Nov 2023 16:24:03 +0100 Message-ID: <20231124152408.140936-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Upgrade libvirt-ci so it covers macOS 14. Add a manual entry (QEMU_JOB_OPTIONAL: 1) to test on Sonoma release. Refresh the lci-tool generated files. Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231109160504.93677-3-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/cirrus.yml | 16 ++++++++++++++++ .gitlab-ci.d/cirrus/macos-14.vars | 16 ++++++++++++++++ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.d/cirrus/macos-14.vars diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 07dc6edae1c..64f2e25afab 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -74,6 +74,22 @@ aarch64-macos-13-base-build: PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 +aarch64-macos-14-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-14 + CIRRUS_VM_INSTANCE_TYPE: macos_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 + QEMU_JOB_OPTIONAL: 1 + # The following jobs run VM-based tests via KVM on a Linux-based Cirrus-CI job .cirrus_kvm_job: diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars new file mode 100644 index 00000000000..43070f4a265 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-14.vars @@ -0,0 +1,16 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-14 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +CCACHE='/opt/homebrew/bin/ccache' +CPAN_PKGS='' +CROSS_PKGS='' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' +PACKAGING_COMMAND='brew' +PIP3='/opt/homebrew/bin/pip3' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 36bc517161c..77c800186f3 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 36bc517161c45ead20224d47f2dc4fa428af6724 +Subproject commit 77c800186f34b21be7660750577cc5582a914deb diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 993683cf484..0c93557ad67 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -207,6 +207,7 @@ try: # generate_cirrus("freebsd-13") generate_cirrus("macos-13") + generate_cirrus("macos-14") # # VM packages lists From patchwork Fri Nov 24 15:24:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746808 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1568954wru; Fri, 24 Nov 2023 07:26:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFh2w5YyF4haysPeCHFe6Oq8iOceOaWrSgHcENH8FdyyZipGKFQ/jgoTI6VkKrs5ebJd/S2 X-Received: by 2002:ac8:5d44:0:b0:423:82dc:61bd with SMTP id g4-20020ac85d44000000b0042382dc61bdmr3856143qtx.39.1700839600309; Fri, 24 Nov 2023 07:26:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700839600; cv=none; d=google.com; s=arc-20160816; b=0ciQF6XbmLDxVRGF7YHMLUo5H15C8SmPFiTpE3HXCMx3dNP5xk4wkiqY8jqqz0LQXH 1q4mvS7iN+CwfGRdn2DLiXMDFwD/be+iXhTOGwIv7oLwluuz3e/ALV0sniCjL5PBwzOM 4o60GRQF+cT02HT8EO7wfrH667WaBlDhwEeIvG44ecCa3xuJQxTk+DbyUpfSvCyYYEIg yth7Ske6wYfkc99ifdbajh0/qSsurVNIMGaX7cTcRJnxMX2Uzg8XTAaKC9Fd6kMF2yWa C+c0t7WhJkMqv7jymomoqTgeE/zs7cvOLDHmzV6qWWUJqZ6ArQ8nCEZN+oAtxFpex9gH WUTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; fh=ZYRhjxh4TbEGWeHUEUczat8I5IqOzszAZGoR1XyQvCI=; b=r80FiEGNIDyYC77xExGzkZwsxXm218W/DEpOzY4qA7XlNWftAPnQKrZFw4Y0RE9lbv WjPGJGKGrQm4v1YdHhj0mhH57IyEtixJLNKhvTRBU0aqR05itQC2j62/9sKwPC7DiBhI iVpSD42/St0U/NCndUAPVz0aFpQboggGoq/+dT+n8tP24Zo77vh6Rq8LRBfcVQr+PDQz xsiu+TQSAGT06OPe/fcHn4I5pmORUmcopmtbibOtRDYoGXKSARBFNphdN8CZLxYu55sI 3SDzRXd+cdWJ7bWYMwBXZiu66bxMbJqjJM6SXqugitfHJacubOfBMuSYWazqX2AtG/pL j/MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J1rAFXZ3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w9-20020a05622a190900b0042377c76e77si3538595qtc.589.2023.11.24.07.26.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 07:26:40 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J1rAFXZ3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2m-0004iU-HR; Fri, 24 Nov 2023 10:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2l-0004i5-9T for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:35 -0500 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 1r6Y2j-0004Bd-NC for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839472; 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=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; b=J1rAFXZ3RrOMEux4TIL/1BA3T7DPUwc3jWmloQ5ejR+j75aU34QrsdE16YX4loOCNq7bjd 0/bThATY0JxbAtQwi55Tn21SwSeBWsWT291o6Ey2Y55Y8bAQRycWe4KrStZ0FKivTC4p/v iqvFak2rAZT04CbPx8O/H1M7Bd7pYMU= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-I61ebTawOWavAh6SRkdjGA-1; Fri, 24 Nov 2023 10:24:29 -0500 X-MC-Unique: I61ebTawOWavAh6SRkdjGA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77a12fbe7eeso193617485a.2 for ; Fri, 24 Nov 2023 07:24:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839468; x=1701444268; 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=IwpePLbK8L8er5IFJ0cDPeto50q8k0R3zr0tlVz0C5o=; b=kgBfyIuyaEY5ZU79vakVvFJD5lQ/s8cW2lJn/qDzt53F1rwESymKjsFM50/aroRa0Y pQHYvxeBakcj2JPvDV5851A1/21HvOKYpzmsnHpmwbsMuHXnLjJ8ATwgn2SKNBzw1DLC /Wx0zcd/SmK4w1QiC0uuColyjw1mF8oXVGYhBEh7GcbKKSW0y7WRz9CpsFecRMhbf+5g eFYeejTBN6eNiUhJFQ2rqTVVHZjEK1MgChMVOnh2yUt2Mx4q3NyOTHQ463f6/Q3myptP /kjFRbzbt5iptQsMHAFqPCN4NQc0AnF2mSMr1DEcUJWiLyZOyKpkJo7KUDBiJ1HS7qOb 65Jg== X-Gm-Message-State: AOJu0YxpyimbftwMTV7YO23fOftoZ3wT86ikf0waiQCVfZWBKN+vM15q vAlmQlv4LvKcTOFCprz8oE4SO2jkXcgjyLW2nsDZ1hP9DLV9eT/KUSGB6yk1eIuFmkf69nOhY9i h6G8rpe6XHMFb4cTYSyt7kZSYUeg+7i2euLopdkuV0ULNY1gOTdVlN5hvzLs/SA10D+GO4jF+Vs Q= X-Received: by 2002:a05:620a:4883:b0:77b:c650:5eab with SMTP id ea3-20020a05620a488300b0077bc6505eabmr3597048qkb.5.1700839468004; Fri, 24 Nov 2023 07:24:28 -0800 (PST) X-Received: by 2002:a05:620a:4883:b0:77b:c650:5eab with SMTP id ea3-20020a05620a488300b0077bc6505eabmr3597009qkb.5.1700839467593; Fri, 24 Nov 2023 07:24:27 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id ss12-20020a05620a3acc00b0077d62e78db9sm1282569qkn.128.2023.11.24.07.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PULL 07/10] disas/cris: Pass buffer size to format_dec() to avoid overflow warning Date: Fri, 24 Nov 2023 16:24:05 +0100 Message-ID: <20231124152408.140936-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Propagate the buffer size to format_dec() and use snprintf(). This should silence this UBSan -Wformat-overflow warning: In file included from /usr/include/stdio.h:906, from include/qemu/osdep.h:114, from ../disas/cris.c:21: In function 'sprintf', inlined from 'format_dec' at ../disas/cris.c:1737:3, inlined from 'print_with_operands' at ../disas/cris.c:2477:12, inlined from 'print_insn_cris_generic.constprop' at ../disas/cris.c:2690:8: /usr/include/bits/stdio2.h:30:10: warning: null destination pointer [-Wformat-overflow=] 30 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 | __glibc_objsize (__s), __fmt, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 | __va_arg_pack ()); | ~~~~~~~~~~~~~~~~~ Reported-by: Akihiko Odaki Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231120132222.82138-1-philmd@linaro.org> [Rewritten to fix logic and avoid repeated expression. - Paolo] Signed-off-by: Paolo Bonzini --- disas/cris.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/disas/cris.c b/disas/cris.c index 0b0a3fb9165..409a224c5d1 100644 --- a/disas/cris.c +++ b/disas/cris.c @@ -1731,10 +1731,10 @@ format_hex (unsigned long number, unsigned (== 0). */ static char * -format_dec (long number, char *outbuffer, int signedp) +format_dec (long number, char *outbuffer, size_t outsize, int signedp) { last_immediate = number; - sprintf (outbuffer, signedp ? "%ld" : "%lu", number); + snprintf (outbuffer, outsize, signedp ? "%ld" : "%lu", number); return outbuffer + strlen (outbuffer); } @@ -1876,6 +1876,12 @@ print_flags (struct cris_disasm_data *disdata, unsigned int insn, char *cp) return cp; } +#define FORMAT_DEC(number, tp, signedp) \ + format_dec (number, tp, ({ \ + assert(tp >= temp && tp <= temp + sizeof(temp)); \ + temp + sizeof(temp) - tp; \ + }), signedp) + /* Print out an insn with its operands, and update the info->insn_type fields. The prefix_opcodep and the rest hold a prefix insn that is supposed to be output as an address mode. */ @@ -2105,7 +2111,7 @@ print_with_operands (const struct cris_opcode *opcodep, if ((*cs == 'z' && (insn & 0x20)) || (opcodep->match == BDAP_QUICK_OPCODE && (nbytes <= 2 || buffer[1 + nbytes] == 0))) - tp = format_dec (number, tp, signedp); + tp = FORMAT_DEC (number, tp, signedp); else { unsigned int highbyte = (number >> 24) & 0xff; @@ -2241,7 +2247,7 @@ print_with_operands (const struct cris_opcode *opcodep, with_reg_prefix); if (number >= 0) *tp++ = '+'; - tp = format_dec (number, tp, 1); + tp = FORMAT_DEC (number, tp, 1); info->flags |= CRIS_DIS_FLAG_MEM_TARGET_IS_REG; info->target = (prefix_insn >> 12) & 15; @@ -2340,7 +2346,7 @@ print_with_operands (const struct cris_opcode *opcodep, { if (number >= 0) *tp++ = '+'; - tp = format_dec (number, tp, 1); + tp = FORMAT_DEC (number, tp, 1); } } else @@ -2397,7 +2403,7 @@ print_with_operands (const struct cris_opcode *opcodep, break; case 'I': - tp = format_dec (insn & 63, tp, 0); + tp = FORMAT_DEC (insn & 63, tp, 0); break; case 'b': @@ -2426,11 +2432,11 @@ print_with_operands (const struct cris_opcode *opcodep, break; case 'c': - tp = format_dec (insn & 31, tp, 0); + tp = FORMAT_DEC (insn & 31, tp, 0); break; case 'C': - tp = format_dec (insn & 15, tp, 0); + tp = FORMAT_DEC (insn & 15, tp, 0); break; case 'o': @@ -2463,7 +2469,7 @@ print_with_operands (const struct cris_opcode *opcodep, if (number > 127) number = number - 256; - tp = format_dec (number, tp, 1); + tp = FORMAT_DEC (number, tp, 1); *tp++ = ','; tp = format_reg (disdata, (insn >> 12) & 15, tp, with_reg_prefix); } @@ -2474,7 +2480,7 @@ print_with_operands (const struct cris_opcode *opcodep, break; case 'i': - tp = format_dec ((insn & 32) ? (insn & 31) | ~31L : insn & 31, tp, 1); + tp = FORMAT_DEC ((insn & 32) ? (insn & 31) | ~31L : insn & 31, tp, 1); break; case 'P': From patchwork Fri Nov 24 15:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746805 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1568112wru; Fri, 24 Nov 2023 07:25:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IETRVg0z1PgRUmokqjfbj+uWAiJ8OAiuykyEJrkLACFkXgrURVZbqoLt3L9Pqt//g0kUOp4 X-Received: by 2002:ac8:66c5:0:b0:423:9b3d:ed4b with SMTP id m5-20020ac866c5000000b004239b3ded4bmr1558704qtp.16.1700839528397; Fri, 24 Nov 2023 07:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700839528; cv=none; d=google.com; s=arc-20160816; b=PYAkb2vICgB21Sl8ZUmZWfKrlRWBDnUKo9TV3lzwQYaAmE8+pb1CcWzA6s5Z+u/Qtf Tq5n3eCi2ltdg2D+ZN3WnjnE9WgDz6gUHLhqUvynscUhfy5701TTguEPmbDBvWSAYJRH +y4qwtbLh6zQIF549UPlyUA8ZO6tImYzne9cFeLRw6uONnMEVvIvH1LTVwIGtvZIW8F3 D3ob4jNlKOqMWRI1AC5PiH3PPibWDcN1RXmN8+9j2a/lGIlUP4WIkL7inMe6wXHinUPG hyPJ9RHZPAS/JdQPUZ/iyC1N9CFGU0iCvHC9mZy18pbZ/R+6dE9S3bY1jFqNw2mwr5em I6Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; fh=ZPR09covlcbtubK+B/IxAJDTsr3z+SxvqcAu9nSyJBE=; b=y1pErYibQIQZnXzzDDHYsaH8bNUA7h5Zfw9xrg82hhBpLzWf51ZJLClYI2MVZvj9P0 H3oQTdF5I88KoaYruHE1e3/MprSqJF2duZm4inlXVOhoKwrEG//H1vZQ9TFCk6N6xxZP r6GNZAjhPC1K8I+CZ+EZapFOb5cYJ+NR6bBsPmJo4jb11E4FaSjoJJG4RfDNz5pX8YFW 1gxJYtEjVTV37ia6iOfLFG+ERyb9p/EPc4m8OP9Zh1x2njt7Sxhp1+ekIs28zDQ2lYKZ DqKrN/9i8QK3MvuvV6li/AkRuPbUp/KbFBbnmJhYwINWtr3qso1DZ9nG1iFCEe6MmVIj 1GpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HdWafBQF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p1-20020a05622a00c100b004236e7feca6si3614478qtw.156.2023.11.24.07.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 07:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HdWafBQF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2m-0004iS-3I; Fri, 24 Nov 2023 10:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2k-0004ht-C6 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 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 1r6Y2j-0004BZ-0U for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839472; 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=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=HdWafBQFZCj7/0pvN+VXxylIsVf8mpf+ZvkzvvE9D6EP1xvXhYIycUQuW9zcnFkAORXSW5 98ybxhtUsxXUyDdFb8aXkFmHYs2PYA0CygeIcCArX+dAE/Ez/KOrOxT16mv880UZw7Cmcv FKx+9KkZpTC5qafI/ngjxjnnd05ltWY= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-tCqq2nQpOOibu2h8-ChDOQ-1; Fri, 24 Nov 2023 10:24:31 -0500 X-MC-Unique: tCqq2nQpOOibu2h8-ChDOQ-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77d6854a3f9so217927385a.3 for ; Fri, 24 Nov 2023 07:24:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839470; x=1701444270; 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=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=fm8udLjHXE6g/360ba7OXmyo0G3K/6mrrvuSG9yI7v1WvKu2U4FKTdjIEoB6lrgJgu U/HkWLnXenJmV7nnQ+TqlRw+Or8vtXGZ6QMBpNvEHYBs3gNFqjDBMvu79NgGcIAbQydp VoKLnJcLuV8izU0nmGy3olFtEzICNUCZKcFNQZI+FAPLO5VTz7VUXfhmUoNL5N/Wvrh5 Z/EWOulHj5MzmTzjrF2nLTm8pxkR0qvZ/TpTbaCHHwDO5fRB7kfXo/HcJ3ZId661y1bS GnaQSD8Sl8GrD0+Zno32PWqsV5HIj4fIfyUXXYZI0DmD/JAD+lKEYJ/iI9WliS0bf5ex 1bEg== X-Gm-Message-State: AOJu0YyDHXpkPQYNPNVMirknGVdEkoOMZqNCwJ6KXMyEs9eVpTxRNAcF Vz0zGJ8W6Nu/O+7EubUDt6gG2iTkZ5EgDxk2lePr6UXzcOeTsZ4hhQltow3+0Lj37c5qYqIWF/0 67IINXsjW0UBzud4pdFHy8E18dD/sFCCj8l//zX6lixlHd70xIj03dCaxdDIiJZoL4PaDUMFnst w= X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735099qkn.41.1700839470163; Fri, 24 Nov 2023 07:24:30 -0800 (PST) X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735063qkn.41.1700839469828; Fri, 24 Nov 2023 07:24:29 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id z17-20020a05620a261100b0077d85b1d45dsm159875qko.72.2023.11.24.07.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , David Hildenbrand Subject: [PULL 08/10] system: Use &error_abort in memory_region_init_ram_[device_]ptr() Date: Fri, 24 Nov 2023 16:24:06 +0100 Message-ID: <20231124152408.140936-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé If an unexpected error condition happens, we have to abort (&fatal_error is meant for expected errors). Suggested-by: Paolo Bonzini Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Markus Armbruster Message-ID: <20231120133112.82447-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- system/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/memory.c b/system/memory.c index 304fa843ea1..4d9cb0a7fff 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); - mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_ram_device_ptr(MemoryRegion *mr, @@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); - mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_alias(MemoryRegion *mr,