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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 660F6C433DB for ; Tue, 2 Mar 2021 10:15:42 +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 D9D4B64F0E for ; Tue, 2 Mar 2021 10:15:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9D4B64F0E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH244-0006Iv-Kz for qemu-devel@archiver.kernel.org; Tue, 02 Mar 2021 05:15:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH22n-0005HT-SS for qemu-devel@nongnu.org; Tue, 02 Mar 2021 05:14:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lH22k-0000Ps-5r for qemu-devel@nongnu.org; Tue, 02 Mar 2021 05:14:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614680056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7gOHina5LvZTtIqAfV06C4dXH91jtkd7S5D3wR8Vrqk=; b=SdmUZa96zsf8bMR1gZfZxdAe2XUyn7o3NXV9ojsDuSqaripevi6oDzvoDUPZ2RZey4oTQy zjEHX4xz5wdOsvUExf4XV4OcK6t6159ySCLrLbjuCPNaQ9D9965+JEASzGEJBSdS6wjnyf Ysfz6VeJaJEHarJBElkHJEUinloW8hM= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-BKks2kNsOqyLtUh2pb9KHw-1; Tue, 02 Mar 2021 05:14:14 -0500 X-MC-Unique: BKks2kNsOqyLtUh2pb9KHw-1 Received: by mail-ed1-f70.google.com with SMTP id i4so10155101edt.11 for ; Tue, 02 Mar 2021 02:14:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7gOHina5LvZTtIqAfV06C4dXH91jtkd7S5D3wR8Vrqk=; b=cB8jqZFgPMtVrNZrrtOK+8gE9iTm1y4y3DDndKzI/u3gQAwfDrtTNDg8vClleLCUnG GmUATw23Th+xfjyAex+Zt4IBhNKDBCLPli7y8V0DJeFUL4kJZsCt5eeA5HQHKRUkPwpG 9nRxDmINTdl3SEZHwjCQxLqUueMBYs9kUg+g7vylaIk5cf/JVjjR0ihDw2Jqx4QJFsPQ IAdWDAUda4FQ+DeGNJTziDyYb70L5j2XCDGxQk+SnhxyUNvLSny7Xf/1KVjQkr1wgI68 3vr0bc5/VJNL+JcmAm3cy19GKqZvXf8QEZJtWxazzp+rRV4fqtNguOCbTmEBCCDAsAkg M0Pw== X-Gm-Message-State: AOAM533+ixzUtc4xkWlQqa8WEfBzXWa8ycgUQrqrdTG7sHS4WcTBRWXV /un+uB0i0ixd4w8CDvDKKqTHo7lLSpsqfuvS2OHF9RBJpABkYqn42WF31m8And0VlV89ATK0duF KF7Pux0Y7y5qivgM= X-Received: by 2002:a17:906:a896:: with SMTP id ha22mr20041715ejb.503.1614680053279; Tue, 02 Mar 2021 02:14:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+AwAB4NnWPBp4CTT2nlqsdH+6Qu6UO6P5scv2gcREtDTBVy7kXMhWggRk6A4XJCbwDVduLQ== X-Received: by 2002:a17:906:a896:: with SMTP id ha22mr20041702ejb.503.1614680053082; Tue, 02 Mar 2021 02:14:13 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id u15sm4856881eds.6.2021.03.02.02.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 02:14:12 -0800 (PST) Date: Tue, 2 Mar 2021 05:14:10 -0500 From: "Michael S. Tsirkin" To: Vitaly Cheptsov Subject: Re: [PATCH] i386/acpi: restore device paths for pre-5.1 vms Message-ID: <20210302051119-mutt-send-email-mst@kernel.org> References: <20210301195919.9333-1-cheptsov@ispras.ru> MIME-Version: 1.0 In-Reply-To: <20210301195919.9333-1-cheptsov@ispras.ru> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Igor Mammedov , Thomas Lamprecht , qemu-devel@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Mar 01, 2021 at 10:59:18PM +0300, Vitaly Cheptsov wrote: > After fixing the _UID value for the primary PCI root bridge in > af1b80ae it was discovered that this change updates Windows > configuration in an incompatible way causing network configuration > failure unless DHCP is used. More details provided on the list: > > https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html > > This change reverts the _UID update from 1 to 0 for q35 and i440fx > VMs before version 5.2 to maintain the original behaviour when > upgrading. > > Cc: qemu-stable@nongnu.org > Cc: qemu-devel@nongnu.org > Reported-by: Thomas Lamprecht > Suggested-by: Michael S. Tsirkin > Signed-off-by: Vitaly Cheptsov Fixes: af1b80ae56c9 ("i386/acpi: fix inconsistent QEMU/OVMF device paths") I'll pick it up now. > --- > hw/i386/acpi-build.c | 4 ++-- > hw/i386/pc_piix.c | 2 ++ > hw/i386/pc_q35.c | 2 ++ > include/hw/i386/pc.h | 1 + > 4 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 31a5f6f4a5..442b4629a9 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1277,7 +1277,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > dev = aml_device("PCI0"); > aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03"))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > - aml_append(dev, aml_name_decl("_UID", aml_int(0))); > + aml_append(dev, aml_name_decl("_UID", aml_int(pcmc->pci_root_uid))); > aml_append(sb_scope, dev); > aml_append(dsdt, sb_scope); > > @@ -1296,7 +1296,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"))); > aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); > aml_append(dev, aml_name_decl("_ADR", aml_int(0))); > - aml_append(dev, aml_name_decl("_UID", aml_int(0))); > + aml_append(dev, aml_name_decl("_UID", aml_int(pcmc->pci_root_uid))); > aml_append(dev, build_q35_osc_method()); > aml_append(sb_scope, dev); > if (mcfg_valid) { > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 2904b40163..46cc951073 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -405,6 +405,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pcmc->default_nic_model = "e1000"; > + pcmc->pci_root_uid = 0; > > m->family = "pc_piix"; > m->desc = "Standard PC (i440FX + PIIX, 1996)"; > @@ -448,6 +449,7 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > pcmc->kvmclock_create_always = false; > + pcmc->pci_root_uid = 1; > } > > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 0a212443aa..53450190f5 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -329,6 +329,7 @@ static void pc_q35_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pcmc->default_nic_model = "e1000e"; > + pcmc->pci_root_uid = 0; > > m->family = "pc_q35"; > m->desc = "Standard PC (Q35 + ICH9, 2009)"; > @@ -375,6 +376,7 @@ static void pc_q35_5_1_machine_options(MachineClass *m) > compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > pcmc->kvmclock_create_always = false; > + pcmc->pci_root_uid = 1; > } > > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index c9d194a5e7..d4c3d73c11 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -105,6 +105,7 @@ struct PCMachineClass { > int legacy_acpi_table_size; > unsigned acpi_data_size; > bool do_not_add_smb_acpi; > + int pci_root_uid; > > /* SMBIOS compat: */ > bool smbios_defaults; > -- > 2.24.3 (Apple Git-128)