From patchwork Tue Oct 26 09:37:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 516178 Delivered-To: patch@linaro.org Received: by 2002:ac0:c404:0:0:0:0:0 with SMTP id t4csp104264imj; Tue, 26 Oct 2021 02:42:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcW13QwzEFgqoudTc7RAlCVhnCWRPf3legHqkWgp4ycNHAuHi1HLXJxr3BoAwzNzDExn1j X-Received: by 2002:a05:6830:13d6:: with SMTP id e22mr6908707otq.0.1635241359049; Tue, 26 Oct 2021 02:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635241359; cv=none; d=google.com; s=arc-20160816; b=CbX93Fni7JhTVcBd6oF791SRUhALpc7IiGfZiJ1BA98M8kz/Vu8+aL4op6MDdwhSBU zAcFxz2erDCPVxYj8elwYzmPYVODZ4069E4g3s3Ia/52n3rNnXnaHlzq7eAYQGjd7/0i SJmmy/WvKsUpDeucYtizk8sEbqTw4eZl5ClNiIoHc/gYfKU6G/Gw12RVG8nxzz4mtZyG EA5MfpdcGfLY716kkHQ+qmGPD6uGpRBdGTaYgi5rB2jBW1rNu+yxu/abisD4XWzGWbxJ XZXysS00SvpEUSJ29JHFdWc7WMJOT+OaYO8LX5/a8MMfrcRQF4h1RtZCrqHU8q/eOu1E IeWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=BmMrpYkgE/fWANKuzs5Jq3pS/XyK0/piOHbkSrbmmZU=; b=g7uEcipwekFEh1dUxnDh+JD5c/qcLBR0SMuHEyN7RS+8HECu5TNp1e7g7KyocuXDu7 pWZ1KXzSxW03/0uyh0vk3C5tZTBplfWPoY8000IUiyW/+DuGw1hi63du6V1WmDE7ETEw nACOmox1EE/Z67CEYvYeeihrT3t34zox6XZPptFz8NfqLoZtNbYYlX/JQtxNtvxwvdqc uaGL5I2RumvFTEZ0vkWMISWCyLhRadfN5Da+1u+naliNgrBd8g0Fvlzhd3cr/WdLSYwt GRGpB4f2zIZoeft/bx7dG1i/iffof9xWLQJ8HHjEyjzboZNELbPzvJBuLmRrwZDRNwg8 5e9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wvQGtyI7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r125si20819455oig.22.2021.10.26.02.42.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Oct 2021 02:42:39 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=wvQGtyI7; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfIyc-00078R-6j for patch@linaro.org; Tue, 26 Oct 2021 05:42:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfIxw-00075p-59 for qemu-devel@nongnu.org; Tue, 26 Oct 2021 05:41:57 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfIxt-00063y-7O for qemu-devel@nongnu.org; Tue, 26 Oct 2021 05:41:55 -0400 Received: by mail-wm1-x335.google.com with SMTP id m42so13449247wms.2 for ; Tue, 26 Oct 2021 02:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BmMrpYkgE/fWANKuzs5Jq3pS/XyK0/piOHbkSrbmmZU=; b=wvQGtyI78kw9nVM9Vxuzg3QyJMq/9aiy4ldGAHMKdGomIiCg7qV6wDxEbf81rSWemY evjdhYfUYQw8ayFhl4BmjlHUnMm9g43f9qQdFnhhLAKALiOw4V0dGkVGJuDWOyKdXr9N LueAaqqP8/CMHsa9xI3bzJyw/0TrEUH0xlgTUNN/YjnOqQ/EAhRb2OJTHtWFUWe4cb4M 7aorBI7gnjBOupne0P0dGBtt3+0qAcRf1RPhTv/UqGZbcC29cw7O8XWqiE0/W5HyVVcs uWtYPqLaee9fBl8PcFM/665wYNNorNtBt9PiD50xIsx0dYUvQ+gKJW7Ovmz7uzis/gV7 ebDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BmMrpYkgE/fWANKuzs5Jq3pS/XyK0/piOHbkSrbmmZU=; b=iYnsbKA+JVv2j6dXy0L6QvQ59dVAmf8YGtD7FI0//2/VJJnyduXnFewIqJZ/Z8/qG6 1O5TMuVtVKgTqdjgQYnD7wYmCjKNSzc07Y236JYRtSVXdB2EolqD5mvOt6SSQ/a+0ZkC c4ki2q0ATPyN77k9EdoCcCp5MtIwZ3R6y1nBc0RQXhkZdeuaZWhFO52DbYcxe0FKBS7e AmSmERFzeA8iJm/SS7rKWj/3PjJZsxUgcfah25H5NOP41Kob//t+6hE9I9x29phop4xs wdOqPqtNPbMd6rTBtrHHZ+Kiwj3lRc9R0kDuoTYGkeyl2Pa+w12e5WETRUYT3m/48rCi Vqlg== X-Gm-Message-State: AOAM532LqFMKI3ZQWcgUGzKP2/guHSHVFo0xPrIx35JWsgivSpPtZ5u+ eRSGpySoTVJnCDI0TfInViqJcw== X-Received: by 2002:a05:600c:1912:: with SMTP id j18mr7870695wmq.173.1635241311644; Tue, 26 Oct 2021 02:41:51 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id s3sm71554wmh.30.2021.10.26.02.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 02:41:51 -0700 (PDT) From: Jean-Philippe Brucker To: peter.maydell@linaro.org Subject: [PATCH v2] hw/arm/virt: Rename default_bus_bypass_iommu Date: Tue, 26 Oct 2021 10:37:34 +0100 Message-Id: <20211026093733.2144161-1-jean-philippe@linaro.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Eric Auger , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since commit d8fb7d0969d5 ("vl: switch -M parsing to keyval"), machine parameter definitions cannot use underscores, because keyval_dashify() transforms them to dashes and the parser doesn't find the parameter. This affects option default_bus_bypass_iommu which was introduced in the same release: $ qemu-system-aarch64 -M virt,default_bus_bypass_iommu=on qemu-system-aarch64: Property 'virt-6.1-machine.default-bus-bypass-iommu' not found Rename the parameter to "default-bus-bypass-iommu". Passing "default_bus_bypass_iommu" is still valid since the underscore are transformed automatically. Fixes: 6d7a85483a06 ("hw/arm/virt: Add default_bus_bypass_iommu machine option") Reviewed-by: Eric Auger Reviewed-by: Philippe Mathieu-Daudé Tested-by: Eric Auger Signed-off-by: Jean-Philippe Brucker --- v2: Resending to be merged separately from the equivalent x86 fix, already queued by Paolo [2]. No change other than added review tag. v1: https://lore.kernel.org/qemu-devel/20211013160607.649990-2-jean-philippe@linaro.org/ [2] https://lore.kernel.org/qemu-devel/55e7387a-4bc0-1743-1013-19c38a6ceb77@redhat.com/ --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.33.0 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ca433adb5b..369552ad45 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2737,10 +2737,10 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) "Set the IOMMU type. " "Valid values are none and smmuv3"); - object_class_property_add_bool(oc, "default_bus_bypass_iommu", + object_class_property_add_bool(oc, "default-bus-bypass-iommu", virt_get_default_bus_bypass_iommu, virt_set_default_bus_bypass_iommu); - object_class_property_set_description(oc, "default_bus_bypass_iommu", + object_class_property_set_description(oc, "default-bus-bypass-iommu", "Set on/off to enable/disable " "bypass_iommu for default root bus");