From patchwork Wed Aug 11 08:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 12430517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00D10C4338F for ; Wed, 11 Aug 2021 09:01:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C31D60FC4 for ; Wed, 11 Aug 2021 09:01:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C31D60FC4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDk7B-0006ms-93 for qemu-devel@archiver.kernel.org; Wed, 11 Aug 2021 05:01:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDk5q-000528-7L for qemu-devel@nongnu.org; Wed, 11 Aug 2021 05:00:10 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDk5o-0003vJ-LR for qemu-devel@nongnu.org; Wed, 11 Aug 2021 05:00:09 -0400 Received: by mail-wr1-x42c.google.com with SMTP id x12so1965465wrr.11 for ; Wed, 11 Aug 2021 02:00:07 -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=3qQBizcAPL+RunXn7IZ+1jfP3LDXeGB0/ACl5DPnxpE=; b=dptSZxwVF/YvsHzNAFeZw2PzFBqbivgpS8X5MDTo3MHSNDhOm2FZm19pgvv4bdr7g3 hxxpEk0+P/6JaIsxrMjC3fF0dfeJfr9Ub7pHJ9ylNROr94RN4MBonD6yLyNcFyueu7P9 DbFU8N7MNSw6sry+m5F/nZaah5Xroe4/+g3DIjV+rDA9oVKA5/CCbwtpPkJhmZCDmJTm Ok7CxT21e/nDm8ME2a+oYDZR/8T1e+RcVVyK9v15qnQ1OSP5UiT+rVCyUJvmOGEDINoJ A5GLXeVKBpI5L452B3ngly+iMHG12I41dGu6j3d3Gee8ccY9SsQT3C46zYwJ1qolEgDh klPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3qQBizcAPL+RunXn7IZ+1jfP3LDXeGB0/ACl5DPnxpE=; b=Krcp9FsXalAtEmKStnt38dPTok9ne8+GSr8Qd1ZvJ4aULgPBRKUmRC9v3bDR6DUfjW C5jTnBnvlhdDtEjNLxN8YcAASLclTd5FIRi7La7ms3dIha5Y/OiYRxfXy5lKbAFQCnTQ DRR2aQKS8RmKNQDcsU4WGK3ETzDqZ8AzniuRoLaiqjWG0cWi9xXPvxvV2Vt1BLGGqRdW NyYptC87M/JBUkUTJ9yA/I6XeZXwFI4w//B31Km6wnZ0lkhcJpHsfwdMvasWajx1vN2f fmhodpfQE2XkXQRxKwiisn2jzTg41L7JjDStGdd34qFVSeE09B2cSDMC+Qr47bHvBwHy h0Nw== X-Gm-Message-State: AOAM530fyVbTIJPBvSnguMTu3X+IGOTmBQvcIZWvnR1vqJbf2dTlpKUn rjv0//9LnlinJ307JFZzUuRjrg== X-Google-Smtp-Source: ABdhPJx0S9y50jqdmW+1LTdrK8pfkU2/XRrMCkHRFMUlHAHTvf7gKWUjGUAzy2e60/l1vhwMOjPnwQ== X-Received: by 2002:a5d:4846:: with SMTP id n6mr18611226wrs.91.1628672406410; Wed, 11 Aug 2021 02:00:06 -0700 (PDT) Received: from localhost.localdomain (adsl-84-226-111-173.adslplus.ch. [84.226.111.173]) by smtp.gmail.com with ESMTPSA id q5sm26227538wrx.33.2021.08.11.02.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 02:00:05 -0700 (PDT) From: Jean-Philippe Brucker To: pbonzini@redhat.com Subject: [PATCH 1/2] hw/arm/virt: Rename default_bus_bypass_iommu Date: Wed, 11 Aug 2021 10:58:42 +0200 Message-Id: <20210811085842.2511545-1-jean-philippe@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x42c.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 , armbru@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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") Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Tested-by: Eric Auger --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b4598d3fe6..7075cdc15e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2671,10 +2671,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"); From patchwork Wed Aug 11 08:58:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 12430519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 867A2C4338F for ; Wed, 11 Aug 2021 09:01:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D958260FC4 for ; Wed, 11 Aug 2021 09:01:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D958260FC4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDk7N-0007H6-Sd for qemu-devel@archiver.kernel.org; Wed, 11 Aug 2021 05:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDk64-0005Qd-2D for qemu-devel@nongnu.org; Wed, 11 Aug 2021 05:00:24 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDk62-00044r-Ja for qemu-devel@nongnu.org; Wed, 11 Aug 2021 05:00:23 -0400 Received: by mail-wr1-x435.google.com with SMTP id q10so2023705wro.2 for ; Wed, 11 Aug 2021 02:00:21 -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=IMEyq0QTcSaxiPLGZloAxgxwzusPwMjF/8D98Aa1LAk=; b=xBvIcqM26v2WH/Rj3vkrddRHunLVRXZCTyFZHcrEW4Np1Y765VyjdR2b5h/DW78jdB 9i1SRNBKoNeNdiNRagXbc250qbMJcAU9rGjZm1Icv7B+rWfwAMHUGmaUKpj9J1O6yIs9 vvu1BYvpubC5iWGqXy5g8YM4jNn1X+l38NlLPcKS7l6cc58P2m9OovcbGzLrxGgXE5qi JAQ0LLpEaq3vNmn75uXvuBrsQNT4nWBUg/70cu9eHR0nprfviqHzX4M+Ttib9CMdbmVq EyxU6LJiz93/xSXQtpviZHV5HOOdBVI2zjjbiz1tB/Yka6PmWdT90XvQ+TgsPiTkAJ65 RHNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IMEyq0QTcSaxiPLGZloAxgxwzusPwMjF/8D98Aa1LAk=; b=cHrEZynE139KowgGkWMfMBRidfPl5gkMiVSwfCD1nOCcDY7IvkArcuHw0k9iO5YHih lqGKDoUwkSt6L3nYvi1I+ESPPNmcys6O6DSCxudsxPFv3SwbBqNA6TkDX18EuqwoMuXc E6I89a9vKgqoT9P+QVaKSgavwdwwvPdWMHQUdE+8dEqIW5MdGM2RD7Pjf2mhZ4LWeapu +QeV2Yhl9gGErBxCCs4bMcZqbcymWL1mTLQ17Shl4XsUmvp1tC0VbE513bRt+zWvqTKY rJfXi/FrIcUGB+rV4xZbczWk96bz5cdm6wF6lOvS+eiTjIp8D22tVEQskczge76iuu4G sL3A== X-Gm-Message-State: AOAM532gAFQ/9d7sqQ+2eQaE4PaEco/xul0nImT+Vk3sEsc/YW86M4mZ MpdHqGW4Ksb82359Jj60wSUkzw== X-Google-Smtp-Source: ABdhPJz4Ga/waAfatphmjl16Cn6s3Fij62rAbPGUY/ANf4Y9197sNUXhdneCySATd87QkL4JM6qaHA== X-Received: by 2002:a5d:4846:: with SMTP id n6mr18612489wrs.91.1628672420720; Wed, 11 Aug 2021 02:00:20 -0700 (PDT) Received: from localhost.localdomain (adsl-84-226-111-173.adslplus.ch. [84.226.111.173]) by smtp.gmail.com with ESMTPSA id q5sm26227538wrx.33.2021.08.11.02.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 02:00:20 -0700 (PDT) From: Jean-Philippe Brucker To: pbonzini@redhat.com Subject: [PATCH 2/2] hw/i386: Rename default_bus_bypass_iommu Date: Wed, 11 Aug 2021 10:58:44 +0200 Message-Id: <20210811085842.2511545-2-jean-philippe@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210811085842.2511545-1-jean-philippe@linaro.org> References: <20210811085842.2511545-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=jean-philippe@linaro.org; helo=mail-wr1-x435.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 , armbru@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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-x86_64 -M q35,default_bus_bypass_iommu=on qemu-system-x86_64: Property 'pc-q35-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: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option") Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Tested-by: Eric Auger --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fb24f000e7..ce4756ad59 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1779,7 +1779,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, "hpet", pc_machine_get_hpet, pc_machine_set_hpet); - object_class_property_add_bool(oc, "default_bus_bypass_iommu", + object_class_property_add_bool(oc, "default-bus-bypass-iommu", pc_machine_get_default_bus_bypass_iommu, pc_machine_set_default_bus_bypass_iommu);