From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 59BEFC433E0 for ; Thu, 18 Jun 2020 03:02:07 +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 26CC2208C7 for ; Thu, 18 Jun 2020 03:02:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NCcCG1U7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26CC2208C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlkoY-0007tj-Aa for qemu-devel@archiver.kernel.org; Wed, 17 Jun 2020 23:02:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlknI-00066R-Dg for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:48 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:36710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlknF-0005Mh-C5 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:48 -0400 Received: by mail-ej1-x643.google.com with SMTP id dr13so4791743ejc.3 for ; Wed, 17 Jun 2020 20:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1GRIcuzG4DdAhxC4d6qYQFDt6LiehnQlar4uGfdpt2E=; b=NCcCG1U75hA9E3QYgbYDxqlLwhi+EGj79DuIKhofKWAzBm6Qkm3Dnt2vaDpAPMCPHv Yxc4SRp5HqdvR0AI3SwBSM5S/f6q//rYD9YJmNzofJ46Vc6bYxjqzr/caPk1fUyL3q8M Sz7LkMEqRkmjr9RpVqS4qbYjNj9/bZXMNtmhvRPUABeuCdNUB1Oi/3LNyIqrTl8TJDxp JpoawVdgYUFAJ6lo+H6Ddd7YZ6dZ79KqtcZ8qJL+BLvkOxU/fBtj5fvMjT4hMIfGwuzQ VSvbIMy5ka1O1cQ1ogayPzc1mFt/IIPdqgaeSweTfz059dQEnrsrvuJb9Cf56jPLWRo9 EIAA== 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=1GRIcuzG4DdAhxC4d6qYQFDt6LiehnQlar4uGfdpt2E=; b=M9D5SDbj2B6YFB21gTC73wPs1VVs7j+RbERps3Vj20thTnAoAa1Z78vUdGUxIb2HQO M8vJxID6jUHozo35dsMwJNJIUPjWHLsLPijQFeKrJ3R3i+qQv8NYsB+7nHn9jwevM1IG lnx/dqb6ZSDM4arGIpYD40Zl0L9NrggJcz0TyjMrUhJFD6cBvpUGM2pEas8yyzPBN1CN 5872tz8tVvkYhK60zImCPYY33uxJlCtKxyccyD6Fc1++4OziwyX/Jgk7PRCpdzZZVymB /KMbzBOOFrjV+VD97EXe1B64aky0jDaYHqwTo4y/TEJGzNl+7W4F0AB260KFiamcmsHf ttUw== X-Gm-Message-State: AOAM530f1TfJ/C+UVQaEWHPpOtm64LRDHhamt5HpHwEJxci5RAFTf8RJ e1TJREb/enIB5QizpzHqHk10pHyQEAM= X-Google-Smtp-Source: ABdhPJxJYl9fYTMnSgyRmGyHe2zSE5/gOizX5MB9joKbohCEvCPVSuiki00MI+/DCNJMDHZpW5ReIg== X-Received: by 2002:a17:906:b7cd:: with SMTP id fy13mr1924853ejb.443.1592449243304; Wed, 17 Jun 2020 20:00:43 -0700 (PDT) Received: from jondnuc.lan (IGLD-84-229-154-20.inter.net.il. [84.229.154.20]) by smtp.gmail.com with ESMTPSA id l18sm1034131eds.46.2020.06.17.20.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 20:00:42 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] acpi: i386: Move VMBus DSDT entry to SB Date: Thu, 18 Jun 2020 06:00:27 +0300 Message-Id: <20200618030027.759594-4-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200618030027.759594-1-arilou@gmail.com> References: <20200618030027.759594-1-arilou@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::643; envelope-from=arilou@gmail.com; helo=mail-ej1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: mail@maciej.szmigiero.name, Jon Doron , rvkagan@yandex-team.ru, imammedo@redhat.com, pbonzini@redhat.com, vkuznets@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jon Doron --- hw/i386/acpi-build.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6d9df38e31..38be9e5a58 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1092,7 +1092,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) static void build_isa_devices_aml(Aml *table) { ISADevice *fdc = pc_find_fdc0(); - VMBusBridge *vmbus_bridge = vmbus_bridge_find(); bool ambiguous; Aml *scope = aml_scope("_SB.PCI0.ISA"); @@ -1113,10 +1112,6 @@ static void build_isa_devices_aml(Aml *table) isa_build_aml(ISA_BUS(obj), scope); } - if (vmbus_bridge) { - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); - } - aml_append(table, scope); } @@ -1661,6 +1656,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCIBus *bus = NULL; TPMIf *tpm = tpm_find(); int i; + VMBusBridge *vmbus_bridge = vmbus_bridge_find(); dsdt = init_aml_allocator(); @@ -1675,6 +1671,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_ADR", aml_int(0))); aml_append(dev, aml_name_decl("_UID", aml_int(1))); aml_append(sb_scope, dev); + if (vmbus_bridge) { + aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge)); + } aml_append(dsdt, sb_scope); build_hpet_aml(dsdt); @@ -1692,6 +1691,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_UID", aml_int(1))); aml_append(dev, build_q35_osc_method()); aml_append(sb_scope, dev); + if (vmbus_bridge) { + aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge)); + } aml_append(dsdt, sb_scope); build_hpet_aml(dsdt); -- 2.24.1