From nobody Mon May 6 04:28:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677741779; cv=none; d=zohomail.com; s=zohoarc; b=hbvM7DPh8Cte7Vo6+HD7AAvN8U5NYi/w/gOJfNL0QPAPpKjxbFGV57Q0agpmeBx/T/56BRM6r8iV64n3ar1pIA2r2b4Dj2JzeCugZrghIKxFczh/IwaD0Xu04KxxAgesLTDrMlzL+bqYmxnMfYcFeiE40hurbEDYevETRYSRCqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677741779; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=OEq2P0fC99Z8vw1JjpTEByp0OIInXqVta6mYaAgRMW/cTl+JflXhPk/WcS4swkMH4S7ZN8Wh8YqPq7/fwrAKnK0UmdkF56U5UDHM2iZllywcvy+ZTESplAPu5No51jPMiyIDNuwVerH88x5frTNk03J+rxK+g/KGlBXZbriSbdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677741779681541.3069729439094; Wed, 1 Mar 2023 23:22:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXdGx-0007Xt-Er; Thu, 02 Mar 2023 02:22:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXdGo-0007XA-CM for qemu-devel@nongnu.org; Thu, 02 Mar 2023 02:22:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXdGm-0007Bv-2r for qemu-devel@nongnu.org; Thu, 02 Mar 2023 02:22:29 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-639-kPAybf4nPweava-KRvwXHQ-1; Thu, 02 Mar 2023 02:22:26 -0500 Received: by mail-wm1-f70.google.com with SMTP id x18-20020a1c7c12000000b003e1e7d3cf9fso855041wmc.3 for ; Wed, 01 Mar 2023 23:22:24 -0800 (PST) Received: from redhat.com ([2.52.141.194]) by smtp.gmail.com with ESMTPSA id n37-20020a05600c3ba500b003e2052bad94sm2001156wms.33.2023.03.01.23.22.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 23:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677741747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=Q4+xHeDu6UIxUXxcS/JQNYqQdu+gnZOnfIzhBlGHGi5m+zc12/Tl8sM+kAfy+4FMtCAsZZ BFC41RwU+vqF3EYlofza+GNczb2FsX47HPlMEA4QA9emxDB7m80rVgHTLsizRSlCFv7IfK vI4X3sISDn/RQqwsiE/7feqMG8blqoM= X-MC-Unique: kPAybf4nPweava-KRvwXHQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677741743; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w16c6O5L85j1u7aO8euRCxbVgQ1wD1YQJCSN4IXKOs8=; b=ZOjQ1UlfgwwHlujpbUK2PDWvoymb8dbwFiRnAovGSRlUP5ycSr3/oo9UxnlbOcnOUo yvjISR+rGhemrXCZt5UTmAJpHaCXO265ysYUTSU5pyLkn6MGdTOIqER/ljii6gBWZc10 ZYQ1Do8ZUJRfT57vSrvfi9Sm5TJidLNY5/ksIlnaLsVorNoZzg7SKw5tCt3UnZ6unlaJ LZjcuXc09BxcDTo7nvsTfB1RBzLw6c/0M8mlgA5Wkz/I3gThbL1XHZGYpNH2ZHPXYlZj ST86mbTHeUlxL4jQwuLf+Pq6N3/xNjphH327ts+MOGZahttv8dG3tBvetTt5gjj59OaI FA0A== X-Gm-Message-State: AO0yUKVe1NIijTdkuc41cWLe4NIOwEayC3KZHT6Gzd3dOYx/aAvNJjCA vnbInj1f/EKWj8+HXGdzLWV98gxXFMpjKBlZjQ/z3kb2sCheHldauckwD07YZUTUwT5GV/YcmWR +h9ChCMTKAOYRl4RF9xij/VZSw3Bqr/4U0PDeY6FUauM5YkmkmPlCjP+4ICA/RTt94Q== X-Received: by 2002:a05:600c:755:b0:3e2:66b:e90e with SMTP id j21-20020a05600c075500b003e2066be90emr7696495wmn.10.1677741743623; Wed, 01 Mar 2023 23:22:23 -0800 (PST) X-Google-Smtp-Source: AK7set/qh5NJYAeHX2+MvbXprpMDxtUQJw3OyyCGFIIvLBl8Yp36k67bSb38S00AJnXj6gn/2VW5+Q== X-Received: by 2002:a05:600c:755:b0:3e2:66b:e90e with SMTP id j21-20020a05600c075500b003e2066be90emr7696468wmn.10.1677741743023; Wed, 01 Mar 2023 23:22:23 -0800 (PST) Date: Thu, 2 Mar 2023 02:22:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PATCH] tests/data/acpi/virt: drop (most) duplicate files. Message-ID: <20230302072211.555383-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677741780406100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When virt ACPI files were added, lots of duplicates were created because we forgot that there's a no-prefix fallback: e.g. if tests/data/acpi/virt/APIC.memhp is not there then test will use tests/data/acpi/virt/APIC. Drop these. These were found with $find tests/data/acpi/ -type f -exec sha256sum '{}' ';'|sort -d|uniq -w 64 = --all-repeated=3Dseparate (trick: -d does a dictionary sort so a no-suffix file ends up first). Note: there are still a bunch of issues with duplicates left even after thi= s. First pc and q35 are often identical. Second, sometimes files are identical but not identical to the default fallback, e.g. tests/data/acpi/pc/SLIT.cphp and tests/data/acpi/pc/SLIT.memhp or tests/data/acpi/q35/HMAT.acpihmat-noinitiator and tests/data/acpi/virt/HMAT= .acpihmatvirt Finding a way to deduplicate these is still a TODO item - softlinks maybe? We also need to make rebuild-expected-aml.sh smarter about not creating these duplicates in the 1st place. And maybe we should use softlinks instead of relying on a fallback to make it explicit what version does each test expect? Signed-off-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/data/acpi/virt/APIC.memhp | Bin 172 -> 0 bytes tests/data/acpi/virt/APIC.numamem | Bin 172 -> 0 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 0 bytes tests/data/acpi/virt/FACP.memhp | Bin 276 -> 0 bytes tests/data/acpi/virt/FACP.numamem | Bin 276 -> 0 bytes tests/data/acpi/virt/GTDT.memhp | Bin 96 -> 0 bytes tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 0 bytes tests/data/acpi/virt/IORT.memhp | Bin 128 -> 0 bytes tests/data/acpi/virt/IORT.numamem | Bin 128 -> 0 bytes tests/data/acpi/virt/IORT.pxb | Bin 128 -> 0 bytes tests/data/acpi/virt/MCFG.memhp | Bin 60 -> 0 bytes tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 0 bytes tests/data/acpi/virt/SPCR.memhp | Bin 80 -> 0 bytes tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/data/acpi/virt/APIC.memhp delete mode 100644 tests/data/acpi/virt/APIC.numamem delete mode 100644 tests/data/acpi/virt/DSDT.numamem delete mode 100644 tests/data/acpi/virt/FACP.memhp delete mode 100644 tests/data/acpi/virt/FACP.numamem delete mode 100644 tests/data/acpi/virt/GTDT.memhp delete mode 100644 tests/data/acpi/virt/GTDT.numamem delete mode 100644 tests/data/acpi/virt/IORT.memhp delete mode 100644 tests/data/acpi/virt/IORT.numamem delete mode 100644 tests/data/acpi/virt/IORT.pxb delete mode 100644 tests/data/acpi/virt/MCFG.memhp delete mode 100644 tests/data/acpi/virt/MCFG.numamem delete mode 100644 tests/data/acpi/virt/SPCR.memhp delete mode 100644 tests/data/acpi/virt/SPCR.numamem diff --git a/tests/data/acpi/virt/APIC.memhp b/tests/data/acpi/virt/APIC.me= mhp deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX* gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91 diff --git a/tests/data/acpi/virt/APIC.numamem b/tests/data/acpi/virt/APIC.= numamem deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX* gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91 diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.= numamem deleted file mode 100644 index c47503990715d389914fdf9c8bccb510761741ac..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5196 zcmZvg%WoT16o>EFlh__VVmr>uc{qhq@vO#n^Jr;H?6H%$#EJ2w4N@w(5&}`OsYHcT zDx{D_3)#^~Yza~%{tYBn?AWnj&4zz~9p>D*Gs*8LXQYhh%-r+M{l>@f@oo97-K~;R zv7eed-lo6U{J7^W(q<{8^s#=3D;zie6$2Yz#~e^mBd*G&#KJFRTP>vbqtQOUvmPD||{ z-ST$2(Y1be({-!W@LF=3D<_5DKGnR<~@8kkafrM@3kmUV@qXOz3TzUQqQ?nmwJed5+A z*WYb8X-f7QmO&JpoI%7=3D(_v=3DAe$bDmw6)#eq12^|+n#4$+}u&I@a8Tes^;z-p>KN$ z5mOh4YKUm+S=3D1zi6O$M=3DFlxxCi;TF$7zIWh88<|REisb7xPgo%kuf4M9AGRVV_9U3 zN{kFJmXWa{G7=3DIa2aFYDtcr}J#K;3<6&W{0MoMB7fpHTU)$qf?OU!X3MhO_VkRg^S z|BytbJ_(HXks;S@3L$1@j z#8?Ez8ZzWMEl7;lfYCsPT&G2eaTOR%WXN?oE-|hF!vjW5uG5mlcoP^cWXN?oAu-+t zMjIJ&olZ)OcY(2v47pCHB*t}MY#>9f(`kv}0%H>ya-Ggdj2bXH$dK!_EHQ2X;~p~P zI-Qjm%fR>$8FHP@NsLusY#~Fg(|L(;3m9Es)a5!|kQldtv5gG5PAd}QE--dN#`Z5g zuM^Irx7~9a?kY7O9<@g%s_QPMy+QkCbNjq4@pt=3D$iZjgv z$fQtb(u{(;*gUuO`byZ9A%!=3Dl+t{nq10lb zCxz&lV4ex)nc$ujqGytMCYdL-WavpDdZw5swbSP51&<`fJt;&_hj}{8lUg|Rq!2yR z%rnhA)7+Cn^vp2N4D+Ox4?QVF&n)xIGS4jcq!2xG%rnP4sYOIj3ej_nd5$s9G44qr zdeYAsQ{zDu=3Db0z9l;}wzdKQ>xfq53VCxz%)WS&LlNi8UPQiz`8%yXQ1j&n~6(UX2C zf@g_&Qp<{-6r$$@^PFIw6Wo(R^qgd#lgyJ^T=3Db+6J*SxG6!Vq!2x4nddC?oaLSrqURj*oMWEUa-%1O=3DsC|k z=3Db7g`_oNU#7ntV)^Q0CXJt;)b3iGTm&kFaX(0J}2b!`1snxAj_OWAYR&%cO!v@DTx z(!o;1>%mt#eeYg6R~jAoecuXEVaLEwv`&Dis{+cLJ4fBqvkDtrhSKW=3D$a+IynRA>K zHoBZe>jucWCa}!8kX6bLyk33NbqkreL4fW1?NuRC^br->w z9}fT1Kg(zvUZ*QohI#MjIN$ezB-Ay^2Uc57ft+$_sgb>m6Pa#^|%@=3Dcw`t+!0-VY^R# zDZQh~lwBbPf<BbPf<!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 diff --git a/tests/data/acpi/virt/SPCR.numamem b/tests/data/acpi/virt/SPCR.= numamem deleted file mode 100644 index 24e0a579e7d73f432a614380e29aa95113344186..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmWFza1IJ!U|?W6?d0$55v<@85#X!<1dKp25F11@12F>!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 --=20 MST