From patchwork Sat Feb 5 12:45:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12736062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 44B10C433F5 for ; Sat, 5 Feb 2022 12:59:44 +0000 (UTC) Received: from localhost ([::1]:55946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGKfH-0000Be-Ei for qemu-devel@archiver.kernel.org; Sat, 05 Feb 2022 07:59:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGKSD-0000QV-GU for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:15 -0500 Received: from [2a00:1450:4864:20::434] (port=39771 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGKS8-0006GJ-JI for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:13 -0500 Received: by mail-wr1-x434.google.com with SMTP id v19so1335790wrv.6 for ; Sat, 05 Feb 2022 04:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=evtIBXc2XbOQXIQlNH8D77rdUx7zxf/It59jNbA4TBw=; b=PuvKiVkkmr3sD5KBpbNH3iM0GFQsYHzWDEAEexSc8M9ASRny4gDPLPeOWlH+VNj9X1 RZ3wpBkcQwK3q6dfukAEauCkolx+D91UdsPGx0QhqzadUVgHFH8LP6SwlwLebfjMLyyp 9dLKCGNNAs59jhGqGKD9Q/PyOc2seZ5/cRIU5iqi3wcRcRfIQtt+IhDC0wtBx4G2f55Y oHzSJweGKsYr1pjg4OqGtlXKke+4tkvYyNlFTV29MdaMhRPcs8Xdz45fNTgcDyTjMnQ0 PE3Lh3neD4T5P8B6+0P+hX9NNWlW+S3uNR3WzyxoVIYSC3RZAeBadIbZ2t46i//M3CT4 XuLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=evtIBXc2XbOQXIQlNH8D77rdUx7zxf/It59jNbA4TBw=; b=PQsEpoergylKJ74En/Clwul7VPgGaj7sdf+/fxK5djdQYVXBiA41+2NdLueE4UuFGx 57nuJcA+oNAKASwnE0AqWt0HU1emle6Ao0ijj7AnSb1XrfF2IUSGgm+NsVF+x/12lv1Z t60MRUcYkVuaGpXC8apzPOZtAGoZScMQvOOaii1+zPhy5VYUWLWF5QwImUqSubty4kAL NAWJfKegKRx/Mzd+DwM/8BrW+soQ50rGCxGvVltlwmkGCWM348AQBRYFUqUr51TJCeiE ru8i1c90UOFO1K6xZzK4tYJwk7ahb1er4XhMSe/rshNb9Qo7MVtjL9tqs89DF3Rc+yJ0 cA9w== X-Gm-Message-State: AOAM530CDsbm2l1OqLujLBaLvn1q9YapzzGiC+CgT0T4y9+oidcz/YAb Rp3ayrvaaWNgap3gAZeOUhBlC/tcDww= X-Google-Smtp-Source: ABdhPJyfjuohszKFd0FN7LnJzMh1KUYLFVceTnQRhWQZJ41hFrK4najayA1Rxm4souXs12X97J8DnQ== X-Received: by 2002:a5d:64c8:: with SMTP id f8mr3080693wri.337.1644065133640; Sat, 05 Feb 2022 04:45:33 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id t1sm5378265wre.45.2022.02.05.04.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 04:45:33 -0800 (PST) To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Yang Zhong , "Michael S. Tsirkin" , Jean-Philippe Brucker , =?utf-8?q?Daniel_P_=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/4] tests/qtest/acpi: Temporary allow VIOT table changes Date: Sat, 5 Feb 2022 13:45:23 +0100 Message-Id: <20220205124526.500158-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205124526.500158-1-f4bug@amsat.org> References: <20220205124526.500158-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= In preparation of changing the VIOT table, add it to the ACPI tests allowlist. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8bf..27ab8d3ba8d 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/VIOT.viot", From patchwork Sat Feb 5 12:45:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12736063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1A1DBC433EF for ; Sat, 5 Feb 2022 13:03:11 +0000 (UTC) Received: from localhost ([::1]:32950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGKic-0003v3-7L for qemu-devel@archiver.kernel.org; Sat, 05 Feb 2022 08:03:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGKSE-0000R9-Le for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:15 -0500 Received: from [2a00:1450:4864:20::42c] (port=36503 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGKSB-0006HW-Mb for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:14 -0500 Received: by mail-wr1-x42c.google.com with SMTP id u15so16286938wrt.3 for ; Sat, 05 Feb 2022 04:45:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kqczEjmmxYGSgKtA86NCLgWxtCH+cJ1jSQOS+NjVnJA=; b=fDqFx0ltiNbs89fm411axkE5NG4oNV0wwiQG/wBhovmd64qMexggvcmfle0aB8Ph7n zY8A2LJ5SumGS4M2Uv95hGFGuYoxoN6YUeBYlY1m6kvLgb58EZBwM1JNbopWNKf+db25 ozbIV+Y6/rP5f4idPtQ6OSZFet+4Vc3EI5QBeK5LPbgIkjmUdAw2yZ1ThEY/kGU+uWyO muz4fgg25D3ROE3C8zNx+cEuk/CZ3Gb5hEUMhySACBjA10svCd6Rss/ILNmbMZIutlCc fIdVaTTVzrIX5f6SWO0fTIQDEMetQWgWQI7kKBeaQvGaOe8OIuJugtY2tUhCHMqlk+4V e84A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kqczEjmmxYGSgKtA86NCLgWxtCH+cJ1jSQOS+NjVnJA=; b=D5iF3n6zMEitoaFRHFGpmYZ+LzXFyX/Yx8GcNhlRcTZ5A2GYXIndOA8MlQlj/7zgmA r2yEn+OT12O7G1Id52pEkaClZkf7TfeOWVQb+lIhcgXWlVEB0NAE0NFYb+EQYr0yxd+u ixsn4uRwc+ngDv3VBpBixDi5+vUjs0VI8gfYtXGWBSUrOmZvjV1YmB9fPIPrNKTjis1O 2Skyb3AsALZ9n4TKFz1v2Fy+sMrj7kOPihwF5Z1RerSJij7kjl+LSc0GLd2zt+Jw9LuU /KvM2jMbJap5Kr2FB68D6RK/RLKHBB8RRtqz0V6YfL/O7sCvgaVlrRTlqXN79aeBDZYm Ic5g== X-Gm-Message-State: AOAM531GTCiS9nTgiZdwqilCUofsQpi6bj1sdP4PP4ZFJ0f/EUhKpvOR AWSb84llQSPmQuC5zC+EzG8zhQfhYi4= X-Google-Smtp-Source: ABdhPJywP3MGiFxe1+SuCNMt1DripYChSsg20LEXJcKDgrabHsFkgZ5XGnyHCez4aM9M/GuLuevFFw== X-Received: by 2002:a05:6000:2aa:: with SMTP id l10mr2914067wry.191.1644065138835; Sat, 05 Feb 2022 04:45:38 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id q2sm4433669wrw.14.2022.02.05.04.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 04:45:38 -0800 (PST) To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Yang Zhong , "Michael S. Tsirkin" , Jean-Philippe Brucker , =?utf-8?q?Daniel_P_=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , libvir-list@redhat.com Subject: [PATCH v4 2/4] hw/i386: Attach CPUs to machine Date: Sat, 5 Feb 2022 13:45:24 +0100 Message-Id: <20220205124526.500158-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205124526.500158-1-f4bug@amsat.org> References: <20220205124526.500158-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Previously CPUs were exposed in the QOM tree at a path /machine/unattached/device[nn] where the 'nn' of the first CPU is usually zero, but can vary depending on what devices were already created. With this change the CPUs are now at /machine/cpu[nn] where the 'nn' of the first CPU is always zero. Note: This (intentionally) breaks compatibility with current libvirt code that looks for "/machine/unattached/device[0]" in the assumption it is the first CPU. Cc: libvir-list@redhat.com Suggested-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/x86.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index b84840a1bb9..50bf249c700 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -108,6 +108,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) { Object *cpu = object_new(MACHINE(x86ms)->cpu_type); + object_property_add_child(OBJECT(x86ms), "cpu[*]", OBJECT(cpu)); if (!object_property_set_uint(cpu, "apic-id", apic_id, errp)) { goto out; } From patchwork Sat Feb 5 12:45:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12736061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5F774C433EF for ; Sat, 5 Feb 2022 12:59:28 +0000 (UTC) Received: from localhost ([::1]:55262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGKf1-0008BE-6S for qemu-devel@archiver.kernel.org; Sat, 05 Feb 2022 07:59:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGKSE-0000RA-M4 for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:15 -0500 Received: from [2a00:1450:4864:20::42b] (port=35545 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGKSB-0006Hj-Jp for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:14 -0500 Received: by mail-wr1-x42b.google.com with SMTP id m27so2343726wrb.2 for ; Sat, 05 Feb 2022 04:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yuz/9v4u5M09P8jk52zn4t509YN+V3S2cmy3DTylfSY=; b=a3PVbZ/KtWYQ/Jd25/edukXNjS2/xmVcJz8QHAF8+f17cNOrHnmLqxRxqdcY+3G4F+ UChS+MOvW76BilVatTpuric5+XCDt+OgdWNS84JeNwEU+FHCRgYISgvkE7OZ9JIldgcP 1tVPzlievBvWoCT5czrHEphzEwrUPDt5IemofEOKbTWeXUS5T9Y35Ix0mv0GBjKj39KI Zi3UaUtwSQ3PYQwy6yQeD0KYl2p6xx+vaQmSQtb3ya8HI0aoRn8Uasgy3/QHT+Z8aHRX mtwps1uJg/86TEIlEDVKhewQbfU5Ow41NXcKORwfysj3WlcTC26evR/1dagULzXLVvV1 rsnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Yuz/9v4u5M09P8jk52zn4t509YN+V3S2cmy3DTylfSY=; b=v6TncPsHRXE0CcIcKLf2kYUeiYTDMRF1/gBdXH9x1G8h5HD9sgDgQ3MyOJfoYM0BrX zaELzRv6HJodz55oqO/4p58a4OqJ64KF847lt8QDrCk6QpMVPupUc8CADRlF0c0ndwC7 r+AR5RtPNdLeVzbe1/zLSSfViBz8rn4k95k4zgct7bsQe4V6Lpe/PKV55e3IUWvg7vv1 8HGCdnFCCFfBgUeKVrpUv31WgFy3ZqfenfC02vePotEDK6dUubss4QZhA5KaPPTeJRNl XAXImbVWP2PhRScExbdIFvOaqSE1VPNfqQGp51KoBqTpiGa8aqFnpoJ7vgLdcJcMoQZf GBdQ== X-Gm-Message-State: AOAM530+pwSS2txsLbUUjasIIa8FSHOYB05zIz0SzQlZnpRvDbukZ76Z 8iB1GtQYPiizmjIlWsUofqYU/AM8NB8= X-Google-Smtp-Source: ABdhPJyMwPVn0urrWXsS9FK6UR3fXo9JZIdH9lq4eVClNsEQ7qtYUdMnWMMvAuSLP5x6l+1E4bZTGw== X-Received: by 2002:a05:6000:1707:: with SMTP id n7mr2885350wrc.662.1644065143691; Sat, 05 Feb 2022 04:45:43 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id az16sm3823560wmb.15.2022.02.05.04.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 04:45:43 -0800 (PST) To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Yang Zhong , "Michael S. Tsirkin" , Jean-Philippe Brucker , =?utf-8?q?Daniel_P_=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 3/4] tests/qtest/acpi: Update VIOT table blob Date: Sat, 5 Feb 2022 13:45:25 +0100 Message-Id: <20220205124526.500158-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205124526.500158-1-f4bug@amsat.org> References: <20220205124526.500158-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Empty bios-tables-test-allowed-diff.h and run rebuild-expected-aml.sh to update the VIOT blob. The iasl output diff is: /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20210604 (64-bit version) * Copyright (c) 2000 - 2021 Intel Corporation * * Disassembly of tests/data/acpi/q35/VIOT.viot, Sat Feb 5 11:11:11 2022 * * ACPI Data Table [VIOT] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "VIOT" [Virtual I/O Translation Table] [004h 0004 4] Table Length : 00000070 [008h 0008 1] Revision : 00 [009h 0009 1] Checksum : 3D [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 2] Node count : 0003 [026h 0038 2] Node offset : 0030 [028h 0040 8] Reserved : 0000000000000000 [030h 0048 1] Type : 03 [VirtIO-PCI IOMMU] [031h 0049 1] Reserved : 00 [032h 0050 2] Length : 0010 [034h 0052 2] PCI Segment : 0000 [036h 0054 2] PCI BDF number : 0010 [038h 0056 8] Reserved : 0000000000000000 [040h 0064 1] Type : 01 [PCI Range] [041h 0065 1] Reserved : 00 [042h 0066 2] Length : 0018 -[044h 0068 4] Endpoint start : 00003000 +[044h 0068 4] Endpoint start : 00001000 [048h 0072 2] PCI Segment start : 0000 [04Ah 0074 2] PCI Segment end : 0000 -[04Ch 0076 2] PCI BDF start : 3000 -[04Eh 0078 2] PCI BDF end : 30FF +[04Ch 0076 2] PCI BDF start : 1000 +[04Eh 0078 2] PCI BDF end : 10FF [050h 0080 2] Output node : 0030 [052h 0082 6] Reserved : 000000000000 [058h 0088 1] Type : 01 [PCI Range] [059h 0089 1] Reserved : 00 [05Ah 0090 2] Length : 0018 -[05Ch 0092 4] Endpoint start : 00001000 +[05Ch 0092 4] Endpoint start : 00003000 [060h 0096 2] PCI Segment start : 0000 [062h 0098 2] PCI Segment end : 0000 -[064h 0100 2] PCI BDF start : 1000 -[066h 0102 2] PCI BDF end : 10FF +[064h 0100 2] PCI BDF start : 3000 +[066h 0102 2] PCI BDF end : 30FF [068h 0104 2] Output node : 0030 [06Ah 0106 6] Reserved : 000000000000 Raw Table Data: Length 112 (0x70) 0000: 56 49 4F 54 70 00 00 00 00 3D 42 4F 43 48 53 20 // VIOTp....=BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC 0020: 01 00 00 00 03 00 30 00 00 00 00 00 00 00 00 00 // ......0......... 0030: 03 00 10 00 00 00 10 00 00 00 00 00 00 00 00 00 // ................ - 0040: 01 00 18 00 00 30 00 00 00 00 00 00 00 30 FF 30 // .....0.......0.0 - 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 10 00 00 // 0............... - 0060: 00 00 00 00 00 10 FF 10 30 00 00 00 00 00 00 00 // ........0....... + 0040: 01 00 18 00 00 10 00 00 00 00 00 00 00 10 FF 10 // ................ + 0050: 30 00 00 00 00 00 00 00 01 00 18 00 00 30 00 00 // 0............0.. + 0060: 00 00 00 00 00 30 FF 30 30 00 00 00 00 00 00 00 // .....0.00....... Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/q35/VIOT.viot | Bin 112 -> 112 bytes 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/q35/VIOT.viot b/tests/data/acpi/q35/VIOT.viot index 9b179266ccbf84f1c250ee646812d17e27987764..275c78fbe8e93190321d957c91c3f17551f865d4 100644 GIT binary patch delta 10 RcmXRYnBY1wR(PU=1OOI`1E2r^ delta 10 RcmXRYnBY1wR(PU=1OOI`1E2r^ diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 27ab8d3ba8d..dfb8523c8bf 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/VIOT.viot", From patchwork Sat Feb 5 12:45:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12736060 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B709FC433EF for ; Sat, 5 Feb 2022 12:58:23 +0000 (UTC) Received: from localhost ([::1]:51582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGKdy-0005hd-DY for qemu-devel@archiver.kernel.org; Sat, 05 Feb 2022 07:58:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGKSE-0000RB-Re for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:15 -0500 Received: from [2a00:1450:4864:20::336] (port=52161 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGKSB-0006Hr-Lj for qemu-devel@nongnu.org; Sat, 05 Feb 2022 07:46:14 -0500 Received: by mail-wm1-x336.google.com with SMTP id r131so880237wma.1 for ; Sat, 05 Feb 2022 04:45:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AOPY/qtmKHQg2E5Q15NX1b06PLvVTPqP1LdnToTRgJI=; b=aIZXgBd4YJGPwHbT6b+KcuVJevGxm8NPoo7ijv6w9nmqQaoOTQnsfASqpU6JurQXY1 PnU0VUjboAKcfNAhcha3y+WU0pcqY+m8r54WCovaX4a/Y3JBFu3eVqmLkktNSiZXxjH8 nXJLqS+ugLDZfMhSbu2liPZRJVS1FzNdP7KudhfLve1bG8lIiLPKG7JY3GGEctGYDg27 oNKZxyghE/fc0YEPOoTl1K1KA/U000CLOGV3VKcQVehU188ErFEwI4tbX/ZfdE0Xu/RM rNYp9WKVxHw4iEBYFNJ8smykZSRrseSdoU9assjiWO7aAcYUGWBAIHBC1pzL+IWsUpux 3QdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AOPY/qtmKHQg2E5Q15NX1b06PLvVTPqP1LdnToTRgJI=; b=ZgAtGL1V3hWN8rdLN2TVljqDdCkH6YJs0IjDQ17k92UO7gYhkcQ6zRnDD+LcDnlEGr xePOKOfv9BIq5GVyyRYvdZLi3zuwZuUApNfXi+48vqx0UUmEwydIG3IbRQsMkaSdsyNk rpSmlGJ1HxzZvbZ1pSQvh4XQiU4ncERJr5DMXVLY/hzIByjTvoTFWa00H3hS+vRL+HDJ 9sChPJRo+vgQP9AXzD0xFwtmnZTgHa0LYGxRPWxUPGe4vYJGa2yf0PyWVTsPfIf2R434 IZeNzwNz09mtOMRrM7KULR/S3kxV2pSSD6X8q/KilO3UDg0l/JxV1jXfpXWwlKssoN1T VVXw== X-Gm-Message-State: AOAM530qn4wNNmM5QphDCuXuoauHhjnJRfrFVEfy5QGu8DT0KqA83itN Mt9i92Ob37Rr+bINmiQJ2qGuIULl2qw= X-Google-Smtp-Source: ABdhPJxAXZomMB3Xbc/Al5AOGAIBZPIKTC+N+R7inxoCbllxqnzp7bNgwZ3r6kNfXLuqAzNS9KOlSg== X-Received: by 2002:a05:600c:1e84:: with SMTP id be4mr2976375wmb.147.1644065148639; Sat, 05 Feb 2022 04:45:48 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id v8sm3637370wmd.44.2022.02.05.04.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 04:45:48 -0800 (PST) To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Yang Zhong , "Michael S. Tsirkin" , Jean-Philippe Brucker , =?utf-8?q?Daniel_P_=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Ani Sinha , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 4/4] hw/i386/sgx: Attach SGX-EPC objects to machine Date: Sat, 5 Feb 2022 13:45:26 +0100 Message-Id: <20220205124526.500158-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220205124526.500158-1-f4bug@amsat.org> References: <20220205124526.500158-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Previously SGX-EPC objects were exposed in the QOM tree at a path /machine/unattached/device[nn] where the 'nn' varies depending on what devices were already created. With this change the SGX-EPC objects are now at /machine/sgx-epc[nn] where the 'nn' of the first SGX-EPC object is always zero. Reported-by: Yang Zhong Suggested-by: Paolo Bonzini Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/sgx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index a2b318dd938..3ab2217ca43 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -304,6 +304,8 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) for (list = x86ms->sgx_epc_list; list; list = list->next) { obj = object_new("sgx-epc"); + object_property_add_child(OBJECT(pcms), "sgx-epc[*]", OBJECT(obj)); + /* set the memdev link with memory backend */ object_property_parse(obj, SGX_EPC_MEMDEV_PROP, list->value->memdev, &error_fatal);