All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vishal Verma <vishal.l.verma@intel.com>
To: <qemu-devel@nongnu.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	Xiao Guangrong <xiaoguangrong.eric@gmail.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	jingqi.liu@intel.com, Dave Hansen <dave.hansen@linux.intel.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH v2 3/3] tests/acpi: update expected SRAT files
Date: Wed, 27 May 2020 23:48:07 -0600	[thread overview]
Message-ID: <20200528054807.21278-4-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20200528054807.21278-1-vishal.l.verma@intel.com>

Update the expected SRAT files for the change to account for NVDIMM numa
nodes in the SRAT.

AML Diff:
  --- /tmp/asl-V49YJ0.dsl	2020-04-27 18:50:52.680043327 -0600
  +++ /tmp/asl-48AZJ0.dsl	2020-04-27 18:50:52.679043344 -0600
  @@ -3,7 +3,7 @@
    * AML/ASL+ Disassembler version 20190509 (64-bit version)
    * Copyright (c) 2000 - 2019 Intel Corporation
    *
  - * Disassembly of tests/data/acpi/pc/SRAT.dimmpxm, Mon Apr 27 18:50:52 2020
  + * Disassembly of /tmp/aml-U3BZJ0, Mon Apr 27 18:50:52 2020
    *
    * ACPI Data Table [SRAT]
    *
  @@ -13,7 +13,7 @@
   [000h 0000   4]                    Signature : "SRAT"    [System Resource Affinity Table]
   [004h 0004   4]                 Table Length : 00000188
   [008h 0008   1]                     Revision : 01
  -[009h 0009   1]                     Checksum : 80
  +[009h 0009   1]                     Checksum : 68
   [00Ah 0010   6]                       Oem ID : "BOCHS "
   [010h 0016   8]                 Oem Table ID : "BXPCSRAT"
   [018h 0024   4]                 Oem Revision : 00000001
  @@ -140,15 +140,15 @@
   [138h 0312   1]                Subtable Type : 01 [Memory Affinity]
   [139h 0313   1]                       Length : 28

  -[13Ah 0314   4]             Proximity Domain : 00000000
  +[13Ah 0314   4]             Proximity Domain : 00000002
   [13Eh 0318   2]                    Reserved1 : 0000
  -[140h 0320   8]                 Base Address : 0000000000000000
  -[148h 0328   8]               Address Length : 0000000000000000
  +[140h 0320   8]                 Base Address : 0000000108000000
  +[148h 0328   8]               Address Length : 0000000008000000
   [150h 0336   4]                    Reserved2 : 00000000
  -[154h 0340   4]        Flags (decoded below) : 00000000
  -                                     Enabled : 0
  +[154h 0340   4]        Flags (decoded below) : 00000005
  +                                     Enabled : 1
                                  Hot Pluggable : 0
  -                                Non-Volatile : 0
  +                                Non-Volatile : 1
   [158h 0344   8]                    Reserved3 : 0000000000000000

   [160h 0352   1]                Subtable Type : 01 [Memory Affinity]
  @@ -167,7 +167,7 @@

   Raw Table Data: Length 392 (0x188)

  -    0000: 53 52 41 54 88 01 00 00 01 80 42 4F 43 48 53 20  // SRAT......BOCHS
  +    0000: 53 52 41 54 88 01 00 00 01 68 42 4F 43 48 53 20  // SRAT.....hBOCHS
       0010: 42 58 50 43 53 52 41 54 01 00 00 00 42 58 50 43  // BXPCSRAT....BXPC
       0020: 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00  // ................
       0030: 00 10 00 00 01 00 00 00 00 00 00 00 00 00 00 00  // ................
  @@ -186,9 +186,9 @@
       0100: 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00  // ................
       0110: 01 28 03 00 00 00 00 00 00 00 00 06 00 00 00 00  // .(..............
       0120: 00 00 00 02 00 00 00 00 00 00 00 00 01 00 00 00  // ................
  -    0130: 00 00 00 00 00 00 00 00 01 28 00 00 00 00 00 00  // .........(......
  -    0140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
  -    0150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  // ................
  +    0130: 00 00 00 00 00 00 00 00 01 28 02 00 00 00 00 00  // .........(......
  +    0140: 00 00 00 08 01 00 00 00 00 00 00 08 00 00 00 00  // ................
  +    0150: 00 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00  // ................
       0160: 01 28 03 00 00 00 00 00 00 00 00 00 01 00 00 00  // .(..............
       0170: 00 00 00 F8 00 00 00 00 00 00 00 00 03 00 00 00  // ................
       0180: 00 00 00 00 00 00 00 00                          // ........

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 tests/data/acpi/pc/SRAT.dimmpxm             | Bin 392 -> 392 bytes
 tests/data/acpi/q35/SRAT.dimmpxm            | Bin 392 -> 392 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   1 -
 3 files changed, 1 deletion(-)

diff --git a/tests/data/acpi/pc/SRAT.dimmpxm b/tests/data/acpi/pc/SRAT.dimmpxm
index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93a111fb1c0c76a 100644
GIT binary patch
delta 51
scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp

delta 51
icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx

diff --git a/tests/data/acpi/q35/SRAT.dimmpxm b/tests/data/acpi/q35/SRAT.dimmpxm
index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93a111fb1c0c76a 100644
GIT binary patch
delta 51
scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp

delta 51
icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 83d3ea5032..dfb8523c8b 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/pc/SRAT.dimmpxm",
-- 
2.26.2



  parent reply	other threads:[~2020-05-28  5:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-28  5:48 [PATCH v2 0/3] account for NVDIMM nodes during SRAT generation Vishal Verma
2020-05-28  5:48 ` [PATCH v2 1/3] diffs-allowed: add the SRAT AML to diffs-allowed Vishal Verma
2020-05-28  5:48 ` [PATCH v2 2/3] hw/acpi-build: account for NVDIMM numa nodes in SRAT Vishal Verma
2020-05-28 11:19   ` Igor Mammedov
2020-05-28 16:05     ` Verma, Vishal L
2020-05-28  5:48 ` Vishal Verma [this message]
2020-05-28  6:43 ` [PATCH v2 0/3] account for NVDIMM nodes during SRAT generation no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200528054807.21278-4-vishal.l.verma@intel.com \
    --to=vishal.l.verma@intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jingqi.liu@intel.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    --cc=xiaoguangrong.eric@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.