From patchwork Tue Nov 2 18:25:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516698 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp4873156iml; Tue, 2 Nov 2021 11:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyB6/B/z+/3el3NZg9DyJx3URB8jITUBwY5qmbYK6JN/liAKCr8Gklw1vA9zhkxAAvSWXcw X-Received: by 2002:aca:3cc1:: with SMTP id j184mr6761685oia.174.1635878267166; Tue, 02 Nov 2021 11:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635878267; cv=none; d=google.com; s=arc-20160816; b=MUFILeJH+MoSYY9VuofiZUoZCMkict3MEScOt4kS3OfETtYS7aYDTSPXglYnwehlPB oaKQ0EWkQOWpHgMwcI9BqIdrpINIjv+QMXfw3gVBPINJjur7O2hQwuoQ9vS803Fil/E1 E4aLhb8p43fSqaHzL7HLP1C82m2EeuNFBee959JQrXgU3EKPUaCKk+tcozz9Lg/iGVbQ 8IPr9EHdUykaXS/1fQ8BgSxk6bNJ1cHDAIZLEPzNP0irVpzPMB7jY0fNspxBDZFtROXp yQQVi61vk9igRcYndvth7/kjgd3R3GuDyJvL9pm/kxraANA4XCJmg+Hu6NQ1dwdhamsn OWhg== 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:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=gjZPVUhejzMPbTovw5hhnqve/TPMZkIYSlSBPY79smc=; b=WWJ22dHVZF0dy1zAYAOBdXrWqzAWrMf0EHoZwubFPFFv7WyWrmBD/oA8l9C/PXSK8B 10lJc9nltIj02QOhyTxqkZge6X4FIZPnN308UqcVH5DmEpONVeSRo0GLVnKq2vlmMxFi QWowBJ+oB0n1HSpxAsD7gtY/2Sbr6oDuFAdSTNqJShpanaA6gqYcX7lxzef6iwg5TJUw qEvNt5No2YWGlu0C2YD9hxx3cGXe7mZkUYmhEqtAq3Rj1dFpfCtgRbj9D1MXJaWrm8ep BNjhXxNGfc/cbjSCdsly44tn9AQTnjSvSg9ysY3NqowkdMsPyeT09JpxbNMFdHYl0A/e ZswQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zAHBUHDD; 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 4si5272540ois.278.2021.11.02.11.37.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Nov 2021 11:37:47 -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=zAHBUHDD; 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]:36096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhyfK-0000MM-KY for patch@linaro.org; Tue, 02 Nov 2021 14:37:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhyTT-0005oe-3j for qemu-devel@nongnu.org; Tue, 02 Nov 2021 14:25:31 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:45912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhyTR-0004Eg-Ka for qemu-devel@nongnu.org; Tue, 02 Nov 2021 14:25:30 -0400 Received: by mail-qk1-x732.google.com with SMTP id n15so7022666qkp.12 for ; Tue, 02 Nov 2021 11:25:28 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjZPVUhejzMPbTovw5hhnqve/TPMZkIYSlSBPY79smc=; b=zAHBUHDDaodCGT3YW8qxmynZYoCnWg0Bse3sB7efNdFYEpLGAyIf06cKc+MG6ZUJu3 tH0KnePTNGMPeRuuBldtUCV744oXkGQRQg1MuujqoryoL42EZ8spKbm0HFsCnlFhUhEl QiYh46l0ieokMUSiTsJ3GY4UHISOktOkf47VysA/jPkI1OIeXYA0bcvs5gDpkGMC4O4Q dQmzNJoP7LKjuZoP9/usiUf/h/fFwomhZc6yJYncJLggdKF5sPjli25FJQCdX62tAC8C 0cGgWYulBHqCV16FbOeTA515WpbskW3Pk7zt9TItcaLTgRikq+217qVEZwmCcPNJQQrG u6kg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gjZPVUhejzMPbTovw5hhnqve/TPMZkIYSlSBPY79smc=; b=SqL9g+uz42RFwI1V/k9dd0z1hV2sR3RFlwAVByzhu6RoL1V9gDJDYS46xeEJ/YyGPi qMmDIIQMWyEeHOdeRK/mkZXU3ihpSEnTaeb3Oz5a7dHBBnHaN3ERnKSJQJPlqp1Y4o9t D763BwrJehptvat5MqUm9XS4yip4ql3wGvZza5iyel9XzP8qABztREiWcs2vT6QLi9nU +gUsaMivUZGEZEakoGtrmhYKxrb7XynaCCWZuZ4ny6Bf+zZbMDVrf5U22+HMA4NfqxDC BUh67Wpzwfgck+daHbo+oZ91zID53L23FgzPQJkmr7KKVOKnyKaSgBs1jlqXJWpsRHTN 2T6A== X-Gm-Message-State: AOAM533AhowsDB31oDxKCAdnhJvycjb7e39pZQs27wrVDqdNa8a5W/74 IixXXyal5oKQsWC3rkSXdQGhpagdd3AIJQ== X-Received: by 2002:a05:620a:171e:: with SMTP id az30mr21373924qkb.20.1635877527783; Tue, 02 Nov 2021 11:25:27 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id y9sm13701081qko.74.2021.11.02.11.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 11:25:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL v2 11/12] hw/arm/virt: Rename default_bus_bypass_iommu Date: Tue, 2 Nov 2021 14:25:18 -0400 Message-Id: <20211102182519.320319-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211102182519.320319-1-richard.henderson@linaro.org> References: <20211102182519.320319-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::732; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x732.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Eric Auger Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker 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") Signed-off-by: Jean-Philippe Brucker Tested-by: Eric Auger Reviewed-by: Eric Auger Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211026093733.2144161-1-jean-philippe@linaro.org> Signed-off-by: Richard Henderson --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 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");