Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp922334lfm; Tue, 7 Jul 2020 06:08:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVi77ErLo8Hfg3maOqxbtsukOgmiDTlgse/RNQxloFgooE2wwEmDOPuw3FdYvUyPBG5O+5 X-Received: by 2002:a05:6102:10d0:: with SMTP id t16mr31885683vsr.47.1594127292041; Tue, 07 Jul 2020 06:08:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594127292; cv=none; d=google.com; s=arc-20160816; b=ufY42djDc1i3iV9j7jN++8il5KakzA1ClbEt1eKYZEKDPMCU7u3ucA+Rz7Tng8/pNS XcbGAptmW/7A0TlZpBlcq/i7D8iHV5kemqd84fDZHzsfsuJMeaKTHogvoe9lE6Y/ZvOP IAFY3RDw/thLPlJmi64f6b7NASQiO3f5rS2YQ9vT7wtd0S5tiO9nLKkx6m7fdES9Ilt3 ciobvZ9IjCh+XaGCa4TahKoiOveCKJHVpZ8P2M+ET1zDxqwqBydHhDsqhxBqdr7YMiA4 c8hCew7IfusRTt4/QcJ3h2zs+wQ4Lr1OqmHDwtV8baLehYLEbSx0atvX7kpzgRFapfD5 ToUQ== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=sQJ0YdLK1hV5ZbuEPLWSu+ZGB5W4m1BLGPxWcQ/+h54=; b=AY12+eBis2JU06JAjYn1WA9BNNOpCUy3RWEpwX5PWuG99Af3O5KAllOrzHnPh26tL1 KCg2bZsGb8hZxJ9iStZrZLUGiBwh78Sst3mcLEKMHqHbrd1iLaZQbSwah7wtu7utUzE0 Y/EdeHQwDQHMfWLr6X5PkTD6JIlmfobqcysUAeeJfTrNLW0+XcEXYGr86AOXIQgzgbdw 8Lp/6CfEJd52MQyivnkmMuoueQjYdZ1c8w6AurPfD6ywzFJNI1xLFOatAnE6DNqYX9NL 2hesX83ukItO8a2QvNgk7iL/mbY2p7VWv1uzNA9MHLACtPMPyZIC98p7kX+p8ZOsSRrT M70A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Gd2TdN1D; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (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 w4si3438161uag.54.2020.07.07.06.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 06:08:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b=Gd2TdN1D; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnKV-0002Pm-Cs for alex.bennee@linaro.org; Tue, 07 Jul 2020 09:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsn7e-0008AD-LQ for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:54:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27560 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jsn7c-0004rA-H3 for qemu-arm@nongnu.org; Tue, 07 Jul 2020 08:54:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594126491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=sQJ0YdLK1hV5ZbuEPLWSu+ZGB5W4m1BLGPxWcQ/+h54=; b=Gd2TdN1DOY/Kdtp0Htxe5I9jC2JE3oFC7tgcuMo8BCgz7HOawcVWxkibmJmmV5g44QlP73 D4fRM1yfHUzfoujEnMgallOUGFl0mSf+P8IjeDCZm9TEKLRU27ogsAd9aPrfUQJvW/hElP sUmeUC1Kwxy6/bIW7Cat/xTxfunZrJI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-276-ORwh-sUUMPSq2U8fhLpC0w-1; Tue, 07 Jul 2020 08:54:49 -0400 X-MC-Unique: ORwh-sUUMPSq2U8fhLpC0w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2B11832BF5; Tue, 7 Jul 2020 12:54:31 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id D442910023A0; Tue, 7 Jul 2020 12:54:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6CEE631F68; Tue, 7 Jul 2020 14:53:57 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 12/20] microvm/acpi: disable virtio-mmio cmdline hack Date: Tue, 7 Jul 2020 14:53:48 +0200 Message-Id: <20200707125356.32450-13-kraxel@redhat.com> In-Reply-To: <20200707125356.32450-1-kraxel@redhat.com> References: <20200707125356.32450-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 06:04:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: WyYQ2X0q33t6 ... in case we are using ACPI. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov --- hw/i386/microvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index ac605d92b984..fbda323f3b2a 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -343,7 +343,8 @@ static void microvm_machine_reset(MachineState *machine) CPUState *cs; X86CPU *cpu; - if (machine->kernel_filename != NULL && + if (!x86_machine_is_acpi_enabled(X86_MACHINE(machine)) && + machine->kernel_filename != NULL && mms->auto_kernel_cmdline && !mms->kernel_cmdline_fixed) { microvm_fix_kernel_cmdline(machine); mms->kernel_cmdline_fixed = true; -- 2.18.4