From patchwork Thu Jun 18 03:00:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1311716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=d1IznIQQ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49nRXk3snkz9sTD for ; Thu, 18 Jun 2020 13:01:25 +1000 (AEST) Received: from localhost ([::1]:37802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlknq-000665-DF for incoming@patchwork.ozlabs.org; Wed, 17 Jun 2020 23:01:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlknF-00065E-Lr for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:45 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:41956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlknC-0005K0-Jp for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:45 -0400 Received: by mail-ej1-x633.google.com with SMTP id dp18so4771885ejc.8 for ; Wed, 17 Jun 2020 20:00:42 -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=dqraAebD5QRbKdQuVrquG+gMExl4B+6MCfHrrf8I8S0=; b=d1IznIQQgl4Mh2P5OM3+Mod6tNsOOimFOQOis1Wwd/BKGlJvpR6evccc4Oc86tJCWD AVD57rJy0eYQgtSX6NgV4lzhEw4hb3cm8aqcwv3y5Seex/IaxTF5oSCUdyBapJhvAYRG BN9OLVUcpDYjGYqd9VG09oWGY164n+KZlhd7DwIc31mhaL+cI7ARw4GYIstcIcSsaaFS Hgh9B5gwN7w3xZSPmBckGisKnHbM3aRhGKF5sqNxMYawBuJTKE5rSMO/7MkUZFOVuSnv rzRtWihhQtyj0942vzFBXzNCGLIvll3+c6kIYKqTmm3qr1cvTtT2WYdUUD9pZrDCao0d zFTw== 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=dqraAebD5QRbKdQuVrquG+gMExl4B+6MCfHrrf8I8S0=; b=eARKGJaq8JkspsEiiah9yaU7Tt0imV6U1kcgsGKAzz77BFdmV2wDPPba4nmG8cDcDS oMH6/bCi8ppNanBgzFFJE3zx5cbcgJczKbKkdMuwCFOPDnJ3PShSmsPujyPWQVfXkirq wfG2TDBpOrVNky3HlVEs/VPz3e/WE97NoygMRKOMWJGK9YIPJKBKFYNRMHiBncGAmQaC IjYUnWUWmryzt9C+HwKYYjyXAdEfYmtuBIBI8EJiyyUpexV0sNCvA/nyWksEmhHmi1ej SsRcP17jMS861+1VbhDbgst6hPmP47kroHe9YWx8WbB1yeO0pE0qx3Lt8flJkVDtOy74 TyXw== X-Gm-Message-State: AOAM531+/2CZ5/r8c+74yCKRLOjgI9zylEuT+44ao9zzuk0EzyiWryit QGQLAWMWT/lAMbbKVXKMAUWnLwutcMo= X-Google-Smtp-Source: ABdhPJy2SsqiafbwlqYU+fkKe9FgjCHsz6d+TazIIB0I8SZFKl/ZHh5h161dAB8zah7k8qMR9uLyoA== X-Received: by 2002:a17:906:f189:: with SMTP id gs9mr1957000ejb.203.1592449241021; Wed, 17 Jun 2020 20:00:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 20:00:40 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] hyperv: vmbus: Remove the 2nd IRQ Date: Thu, 18 Jun 2020 06:00:25 +0300 Message-Id: <20200618030027.759594-2-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 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=arilou@gmail.com; helo=mail-ej1-x633.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It seems like Windows does not really require 2 IRQs to have a functioning VMBus. Signed-off-by: Jon Doron Reviewed-by: Igor Mammedov --- hw/hyperv/vmbus.c | 3 +-- hw/i386/acpi-build.c | 4 +--- include/hw/hyperv/vmbus-bridge.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index f371240176..a8bcb41026 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2741,8 +2741,7 @@ static const VMStateDescription vmstate_vmbus_bridge = { }; static Property vmbus_bridge_props[] = { - DEFINE_PROP_UINT8("irq0", VMBusBridge, irq0, 7), - DEFINE_PROP_UINT8("irq1", VMBusBridge, irq1, 13), + DEFINE_PROP_UINT8("irq", VMBusBridge, irq, 7), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 900f786d08..91af0d2d0d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1082,9 +1082,7 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) aml_append(dev, aml_name_decl("_PS3", aml_int(0x0))); crs = aml_resource_template(); - aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq0)); - /* FIXME: newer HyperV gets by with only one IRQ */ - aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq1)); + aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq)); aml_append(dev, aml_name_decl("_CRS", crs)); return dev; diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.h index c0a06d832c..33f93de64d 100644 --- a/include/hw/hyperv/vmbus-bridge.h +++ b/include/hw/hyperv/vmbus-bridge.h @@ -19,8 +19,7 @@ typedef struct VMBus VMBus; typedef struct VMBusBridge { SysBusDevice parent_obj; - uint8_t irq0; - uint8_t irq1; + uint8_t irq; VMBus *bus; } VMBusBridge; From patchwork Thu Jun 18 03:00:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1311719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OUh+ol+d; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49nRXk48y1z9sTL for ; Thu, 18 Jun 2020 13:01:25 +1000 (AEST) Received: from localhost ([::1]:37866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlknr-00068B-Bw for incoming@patchwork.ozlabs.org; Wed, 17 Jun 2020 23:01:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlknI-00066B-7B for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:48 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:36710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlknD-0005Lv-Sa for qemu-devel@nongnu.org; Wed, 17 Jun 2020 23:00:47 -0400 Received: by mail-ej1-x644.google.com with SMTP id dr13so4791704ejc.3 for ; Wed, 17 Jun 2020 20:00:43 -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=Rn1IAhGNs9/upHthsg/8AavsULB5jQuIWRYuBoQ3LOY=; b=OUh+ol+dugq2GndhqF7B3H/BcKQc5A7wIV51rBVlJ7x4b3pmu4Jl/tZRDQGNZDTG13 B4djqGWQHV/jubkqjH5x8GX4xYPPtyD/qXGPEBBq62cJX1Lqs8dkm7S9lAmKYKa0x/A5 NS/3OEYgqD1CYxyxcN5qyhLa/MDVewGeuvFjVuCfgTdlAx4428Dx2+fogsqmvSbuugsJ f1YnnzFZ4C7zPMc6mt//3n3IhabG2r6g5SIlFrgkdDr0SG4TfscAcIe9RLgVjwOo1KCQ tJFcNdnWf9Iu2ndl8y9pE0S27v+WI/H6As0id74u4ZJxGE/fyt8IhN39etHRyst7wp+A G3+Q== 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=Rn1IAhGNs9/upHthsg/8AavsULB5jQuIWRYuBoQ3LOY=; b=PCSIxNDNpV7QQ9at18odnfglCBuL47bOl9772mxwF2NjroY6HD4uCF3gCX2tnxglXA nEyspKHpBn5jNJe4hIlUD/LIM+6RhgBU6f6ROBZvpS5xgODvcY5iU9tSBhvZrJ37bG1t +dIV8V1o/kvMakNCcUBrAz8BkpRnpXgAX1sL17LD10z1acREJLqCIA7eESvOq+VLtfEQ CJj9tE/gEtfnbXSny7O67iwaEMqjkWd+9yXvsg2K91wBlPXVw31MLhqgiuZTQVGAuUJ1 UQusysCXhsfGQq4YV519qMlScdSw0F5Ex008Utw5Mw/ki6b3xPyOj+MaTrILDaOleor6 kTKQ== X-Gm-Message-State: AOAM5317+OaopXWoe+PnZ+hERx0JeH4sxCAiXQpy110ujIQSAzLecDeH XhVbU2iKB91OiFCOUnXlHbgvRNbp/5o= X-Google-Smtp-Source: ABdhPJyc5aPhDTIeXhuhTi08Wr15iVQABpC2ugiFH9Dl7DgVT4gAU3j3DD1RK+7iApAoeoE+Q1QSjw== X-Received: by 2002:a17:906:5e0a:: with SMTP id n10mr1963392eju.274.1592449242165; Wed, 17 Jun 2020 20:00:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 20:00:41 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] i386: acpi: vmbus: Add _ADR definition Date: Thu, 18 Jun 2020 06:00:26 +0300 Message-Id: <20200618030027.759594-3-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 Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=arilou@gmail.com; helo=mail-ej1-x644.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It seems like latest HyperV sets _ADR to 0 in the ACPI for the VMBS Signed-off-by: Jon Doron --- hw/i386/acpi-build.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 91af0d2d0d..6d9df38e31 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1061,6 +1061,7 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) dev = aml_device("VMBS"); aml_append(dev, aml_name_decl("STA", aml_int(0xF))); + aml_append(dev, aml_name_decl("_ADR", aml_int(0x0))); aml_append(dev, aml_name_decl("_HID", aml_string("VMBus"))); aml_append(dev, aml_name_decl("_UID", aml_int(0x0))); aml_append(dev, aml_name_decl("_DDN", aml_string("VMBUS"))); From patchwork Thu Jun 18 03:00:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1311718 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=NCcCG1U7; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49nRXk4kJ1z9sVQ for ; Thu, 18 Jun 2020 13:01:26 +1000 (AEST) Received: from localhost ([::1]:37854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlknr-000686-VF for incoming@patchwork.ozlabs.org; Wed, 17 Jun 2020 23:01:24 -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 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+incoming=patchwork.ozlabs.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);