From nobody Fri Dec 19 17:42:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588686677; cv=none; d=zohomail.com; s=zohoarc; b=SYpAQFLAuyJzP9ZxDzTMaAiHwij7yvri3rGSNgxx8Ai5PW84TT+NCr5M9mE5Dp135Tqc8CciubzBPzBELRORQKsM/o0qr0pmk3AHbMeooDJesbPl/B+eO6WU4zckXmEtVIot98pTtGgdsNXXr/Zsg1tdT79I9dkxtTLml5w2Djs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588686677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dU/F5xXPMddt7wfYt+AHFoIrXcl4kiK6uH51F4UWAOc=; b=ONxOi5XxqFxAuhS8juSVEHVpwOWZ1ozME2chQFxXsWW2UQRWZxat9RhV9k3HdU3JS4CQInvrOvzD1b4Al5MCI44jSFoLVlq54YozBGE4onlBUrbVTNt6jlVwJBJDBH+sTUrMrDGIjqpaJ8OHs2wafj0ezwWaZgr78uYhi86l1vc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158868667762113.283654182253485; Tue, 5 May 2020 06:51:17 -0700 (PDT) Received: from localhost ([::1]:38594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVxye-0004yi-8p for importer@patchew.org; Tue, 05 May 2020 09:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVxr7-0000W1-Ck for qemu-devel@nongnu.org; Tue, 05 May 2020 09:43:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24766 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 1jVxr6-0003bc-Le for qemu-devel@nongnu.org; Tue, 05 May 2020 09:43:29 -0400 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-468-AzfLbkAfOg2J-RcHRMyT5w-1; Tue, 05 May 2020 09:43:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22D12107ACF5; Tue, 5 May 2020 13:43:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECE4E60BEC; Tue, 5 May 2020 13:43:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3858C9D55; Tue, 5 May 2020 15:43:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588686208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dU/F5xXPMddt7wfYt+AHFoIrXcl4kiK6uH51F4UWAOc=; b=PODFkJZv0Jx2sOM3pTwaXf3eBRbZwid6ltuWrDmGXdSLRXNmym/itMOrV1MWThE1ZkXm1O VDvfggzmHfgFd8Vy1761fzNsdhbNQXyt4wVcxsH7bmMCG3QSlwihZY5HCuYbgrTXVaFOKf yYcbjO5F2QZ56Lvc+ddoNiLl2MYyeXw= X-MC-Unique: AzfLbkAfOg2J-RcHRMyT5w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 10/13] microvm: disable virtio-mmio cmdline hack Date: Tue, 5 May 2020 15:43:02 +0200 Message-Id: <20200505134305.22666-11-kraxel@redhat.com> In-Reply-To: <20200505134305.22666-1-kraxel@redhat.com> References: <20200505134305.22666-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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/05/05 03:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ... 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 6ba2d9d3f028..a3708fdf1e39 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -369,7 +369,8 @@ static void microvm_machine_reset(MachineState *machine) CPUState *cs; X86CPU *cpu; =20 - if (machine->kernel_filename !=3D NULL && + if (!x86_machine_is_acpi_enabled(X86_MACHINE(machine)) && + machine->kernel_filename !=3D NULL && mms->auto_kernel_cmdline && !mms->kernel_cmdline_fixed) { microvm_fix_kernel_cmdline(machine); mms->kernel_cmdline_fixed =3D true; --=20 2.18.4