From nobody Sat Oct 11 00:44:27 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592410295; cv=none; d=zohomail.com; s=zohoarc; b=cuKk5wpnDHmx42AS9u1EgAaV0AwwdTVbFACOY+XOY58dUudnA+VP3rkB+sFw3eCfww6i5HD3Wti/O7qgFp8896FJEHoAIXMNvX8j41WhatREyV3gaF83TmK0ySPKA9Lsp462cDKDsDZU1xXcB3MmeGMeQJiw31iMOsu8eRghLMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592410295; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Equ/JnK5/pSNVQdbslLALMATjPtO3Yn5bQ1dDGKom0k=; b=npnZaotiyNmGxEKujXuWo/sj1/roqmz4klEJwt05qGoLKRgRzHBenyNmMZU2ENNoXF0iCttaP0FjZNh+mwdEBo9ClIlQKxKzrKt74DrNvKwnNlplR9wGigh0PoJwBmP7dGuE1ujnT3vD7thnTLx9P7nB0eEpQLNYbW9saKjOr0w= 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 1592410295741853.5671518389979; Wed, 17 Jun 2020 09:11:35 -0700 (PDT) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlaf0-0004y1-Rh for importer@patchew.org; Wed, 17 Jun 2020 12:11:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlacu-0002OB-8E for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:24 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:40009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlacs-0008FM-N2 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:23 -0400 Received: by mail-ed1-x52e.google.com with SMTP id p18so2387740eds.7 for ; Wed, 17 Jun 2020 09:09:22 -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 bs1sm65365edb.43.2020.06.17.09.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 09:09:20 -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=Equ/JnK5/pSNVQdbslLALMATjPtO3Yn5bQ1dDGKom0k=; b=WJ0fl8quWLPT3anEOBHqYfAzFELZczJK6+Z2RpuFhPA+fTDiRSGXUl1zZVia+xu0Ox nry/FYFRdxNuhEfrTZFsexPr1GahJYEadCPH/q+Ld4pluNZPAet6LxQO0qxJOnYkZzvt Z9j5kBTLUz7yXINhwDZnABxqrDUSYr0Wj1fewNR0NOYWxJYSzEuEngpv5EtXfjo0vg2i 93P/WnOCThpqSmkwzEIkLFUaB0QW8+MVRihwKqbMhoBANEZCEHEbbZHnsMuJAJM5ynW5 qunwBukM1uj+FoYQgxCwtfd0KKkz0wpZq389UXDLVuKjiJgBihqkS7OCMrIGvzLz3aF5 T0AA== 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=Equ/JnK5/pSNVQdbslLALMATjPtO3Yn5bQ1dDGKom0k=; b=PD8oge5WFZ8C/c4hCVsbT/rHoGlSkhzWl6eE9BicPMcLG9oblx3qO1k70gkovqQ7u/ bNnY3I1KZY8hG4Ql4FWDF+o0bLWm9LDa9bnoaLRbJxNRF6Ydwa29xexswPPWGInkx/nU ys9B8jeMuHNoLRklxoXS+jnMi5+skya60DUZaIaq/oeEd95Zzp7TxynehnQTPqbGcy2m /cwUInobYgKuuvm1+NTi/JasYYPon0lgBfJ0zRiZTDiDuuKFaCplH0huuUX8y4i+4M6f dRBz0IjsG3kR6F8fukTHSrOY5NSRaTVxFidYqUW464tG8BhobpoiKzx/deWtVIKI5Brq 4mvA== X-Gm-Message-State: AOAM533MC6JtSJqQmcxxKRY4f8oZe22ELFxYrA8fUaGQpGhB3xoqR/8/ jub74n+PRfW1GYEmLEmpBCsckP+RQ1w= X-Google-Smtp-Source: ABdhPJyFbMWua+sTn9uov6K6ShDzHMqEXEqf0+Ip6tNls/uPfup8JMSYpDGfRl7c53Y6tg9SFRi0CQ== X-Received: by 2002:a05:6402:3078:: with SMTP id bs24mr7874582edb.284.1592410160669; Wed, 17 Jun 2020 09:09:20 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] hyperv: vmbus: Remove the 2nd IRQ Date: Wed, 17 Jun 2020 19:09:02 +0300 Message-Id: <20200617160904.681845-2-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617160904.681845-1-arilou@gmail.com> References: <20200617160904.681845-1-arilou@gmail.com> MIME-Version: 1.0 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=2a00:1450:4864:20::52e; envelope-from=arilou@gmail.com; helo=mail-ed1-x52e.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It seems like Windows does not really require 2 IRQs to have a functioning VMBus. Signed-off-by: Jon Doron --- dtc | 2 +- hw/hyperv/vmbus.c | 3 +-- hw/i386/acpi-build.c | 4 +--- include/hw/hyperv/vmbus-bridge.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dtc b/dtc index 85e5d83984..88f18909db 160000 --- a/dtc +++ b/dtc @@ -1 +1 @@ -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647 +Subproject commit 88f18909db731a627456f26d779445f84e449536 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 = =3D { }; =20 static Property vmbus_bridge_props[] =3D { - 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() }; =20 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))); =20 crs =3D 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)); =20 return dev; diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bri= dge.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; =20 - uint8_t irq0; - uint8_t irq1; + uint8_t irq; =20 VMBus *bus; } VMBusBridge; --=20 2.24.1 From nobody Sat Oct 11 00:44:27 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592410324; cv=none; d=zohomail.com; s=zohoarc; b=ZCrEs+fVnzwu2RUu9zLe0JQu2j8zT9/+IuHosZ2AiNfbAvKnT3TvDig0Iqv3+7NQiwzHOV127JolA88kBjqPvPu6mRpPBW3rp5fl7DRxnc+2ElMT7gzoYlsOxb83mnsqbxvaBZrB8Cs+3AjGUbUs7Ct8SBAOtfcTOlvGZ9vqrX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592410324; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rn1IAhGNs9/upHthsg/8AavsULB5jQuIWRYuBoQ3LOY=; b=nN78i+WEDzY08GIkABAwq02sFS+pVTyxK3dYsmE2e7f/ZmNJTvXK7JvjE/gSXZzaFrxDZeqoT2xtVyil12f5nODFNzlr7eQqp3pvtgk1uS/QS/cdACGhUhNL/rbXShtKT8/UaP9fBVRyStbF6uJRDZ0d2XYcjlXQ8DcFBLos5gs= 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 159241032475628.000137884232913; Wed, 17 Jun 2020 09:12:04 -0700 (PDT) Received: from localhost ([::1]:48106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlafT-00069J-TU for importer@patchew.org; Wed, 17 Jun 2020 12:12:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlacu-0002Qt-UJ for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:24 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:34289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlact-0008FZ-FV for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:24 -0400 Received: by mail-ed1-x541.google.com with SMTP id w7so2429521edt.1 for ; Wed, 17 Jun 2020 09:09:23 -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 bs1sm65365edb.43.2020.06.17.09.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 09:09:21 -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=aE77UK9H9VuQY5sDkMsvL2qDEkUNj9pQpz4BgF8rdlwB1SCOKLZhF7N5EkPX+Grvk5 E2IhThKrguJUkBZVaSDbDg2FANXthrpQ6b7QKUnnGP6k8CTs6OEnqKp5o3Y+WbQ5XFo3 /sN2Y1YymBj2/c4o3Z161nA2c3dGXNf2YVOe5lWfsIiWWlZJofQjACiorsyKAPNO4pw4 tKOow6KAcVg5S8beRu/N7CeLSJLy6JN6KFMPwzR7ILXyXIlGBmHHxZllnpPBcSAcneyQ s57UIRuRnMv/klz9h6oBUb1X2tvknqny0UNYxHOuNn6ItDpOut2wIdw40Mw6yZ7L9w7p pABA== 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=Y3Stfdi2krUwTBW40Wk+0XnTuwKoE27xz+U3IGM03j/O9Bs9cUHhBHpxHve711jT3o hxo+Bkln6xOQ3X4PXMAKLp3b0SGwma4kKw2TBNuxUBOmia5O3DxIWGa7DiN0Y6KZk2Cy DXg03gfN3JWCExycW3HdTsXQdiZj8q2HstYdZulhg86Pm1TNmCBvUSCRPOaUYsfd/rI4 TBVO8b8g67xGdFnFiSD0MrneKeP8e4dqBclBuDOFCrm5UbOECcC4EKneBbBcEeyPeasS MpZiz1qDQEQl41JX4G0Kp2uazyL/EyKo2EMSO1V5Vo/9K3lBG9YhNrLZE/SALgjc305+ yNzQ== X-Gm-Message-State: AOAM533HtN1+wIbpycuAmZaBS9/sPxs15EIZSWutr7VxEnyJOxtBjHto 6e604kKwI5tiDjMf6jhOiYHoUhBeIYA= X-Google-Smtp-Source: ABdhPJwr/jlPGs7aNNNdUXWFM1lUZxeGOWtaF+bWDCXTD0hom2IWKa3nsX+8bbZm2yVZ1kbbe47yQQ== X-Received: by 2002:a05:6402:148f:: with SMTP id e15mr8245903edv.368.1592410162035; Wed, 17 Jun 2020 09:09:22 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] i386: acpi: vmbus: Add _ADR definition Date: Wed, 17 Jun 2020 19:09:03 +0300 Message-Id: <20200617160904.681845-3-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617160904.681845-1-arilou@gmail.com> References: <20200617160904.681845-1-arilou@gmail.com> MIME-Version: 1.0 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=2a00:1450:4864:20::541; envelope-from=arilou@gmail.com; helo=mail-ed1-x541.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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) =20 dev =3D 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"))); --=20 2.24.1 From nobody Sat Oct 11 00:44:27 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1592410366; cv=none; d=zohomail.com; s=zohoarc; b=Sdr9CgebpUKBFk7lIi9xEaQ5E6y676H5C6N70dwT/FP7WjX6zG3jdr+rWy2EvZttECNGPdkwbZsTFOWUavYbj1/4tYxtJmf/nQw+7+uV/d/m6sTERysWFkM+qpWtMTLafI+PwJ1Q7KzsfwUNoafcWAeJkKTw5Rne/qlkVp+ozo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592410366; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1GRIcuzG4DdAhxC4d6qYQFDt6LiehnQlar4uGfdpt2E=; b=jApcgEQk/yhQFsl4nwj20FHKCsY/oe0cZPoCBpL+OxkD14ayR2ifjPqJoVpbly3JdnsGnaQZN8UsN+Cn1El5I5y8V4i5HDlfWfnHuJGfz/7Gf0bA0Kz6FAdGJc1i577dPAzxzNUFg2amTusgy2FpfMQeM711hQTmltg8wsXJ9K8= 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 1592410366031950.6696329620061; Wed, 17 Jun 2020 09:12:46 -0700 (PDT) Received: from localhost ([::1]:50608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlag9-0007EG-6m for importer@patchew.org; Wed, 17 Jun 2020 12:12:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlacw-0002WU-Gw for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:26 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:37639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlacu-0008Fe-Vw for qemu-devel@nongnu.org; Wed, 17 Jun 2020 12:09:26 -0400 Received: by mail-ej1-x644.google.com with SMTP id mb16so2972948ejb.4 for ; Wed, 17 Jun 2020 09:09:24 -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 bs1sm65365edb.43.2020.06.17.09.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 09:09:23 -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=QfWC4brhjXeHtmP7/y42LzDvS39A/0HvJYhs0ALyAR0FqCuXrQdNE6WnQMUH0mbWtZ VWEBfL40Qm7/PUqCQe5vzO+sFSgDoEEmsKwqKXnHo0KdcfrSe+b9eXtBzbTdPic6GvHI 401DownIuXeB18+9RRW7geo5r2LtyVnD0VPMGqOW2WFyLPTehBZXMol4rxp/WlyEKB55 +xwBnyLgJ9qYY7Iipb402x03fwgfVVdhsVTa8DmrlcVa6pP1uQ4+czLBz5BDGlacCUWG Ru/oaXjQyjszUExT1f+rDY1FD9mP4JfWghKP04HhFG/j5pjeKLAforeh5xHXl23trmL6 OBaw== 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=bzjN61FXBT82U8vdRnGw96RPc1GvzBDYq4dLCa5eurEhVKMEmFoUknB9NpkwEHu8F8 Ofo5Dtn5u1z2yhwEW14EP8ijSYfPv1QZI3dk59D7SVVUE8TJ8aSDSgKSzkgq8GvO/+MS 1CLjh1avppzS9r51gTXc1a5rqnKh9HLswWEHpSisjWpeJRg3p8pp//hbRutP60UbFkEW P68x94tKcAW2nlEESoKJ4Amu3ge2t+y5XcFAP8QgKBx1/JCywkKfLZCrbO6n3J7P4bHx KbzG6pJ4UbrgDlj4TU9DtLj4khnvYwYUyIjPTUlfDNBxFDVigcL8ijn1Zt8B9DYbudl6 8bBQ== X-Gm-Message-State: AOAM5337drcQ3oB1nOh4Kqi28jhnTdMB7v9OscS+J9iLafGY2sqo3TCx wxebr8wRVR+X0qafGPGeKXPoJTjXLHk= X-Google-Smtp-Source: ABdhPJxuoGe6UnW/uSeT8bqGQN1iXr6q9FZwQjHQoUNH8xwQf4c636VLhiKPHVyCoBvKz/U5MPdsig== X-Received: by 2002:a17:907:20f4:: with SMTP id rh20mr7996254ejb.55.1592410163415; Wed, 17 Jun 2020 09:09:23 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] acpi: i386: Move VMBus DSDT entry to SB Date: Wed, 17 Jun 2020 19:09:04 +0300 Message-Id: <20200617160904.681845-4-arilou@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617160904.681845-1-arilou@gmail.com> References: <20200617160904.681845-1-arilou@gmail.com> MIME-Version: 1.0 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 =3D pc_find_fdc0(); - VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); bool ambiguous; =20 Aml *scope =3D aml_scope("_SB.PCI0.ISA"); @@ -1113,10 +1112,6 @@ static void build_isa_devices_aml(Aml *table) isa_build_aml(ISA_BUS(obj), scope); } =20 - if (vmbus_bridge) { - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); - } - aml_append(table, scope); } =20 @@ -1661,6 +1656,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCIBus *bus =3D NULL; TPMIf *tpm =3D tpm_find(); int i; + VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); =20 dsdt =3D init_aml_allocator(); =20 @@ -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); =20 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); =20 build_hpet_aml(dsdt); --=20 2.24.1