qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 0f3ef1: hw/i386: Update SSDT table used by "m


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 0f3ef1: hw/i386: Update SSDT table used by "make check"
Date: Tue, 12 Jun 2018 05:33:02 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0f3ef1c0628d15e27b1cc4bf9fbd0e5532c59c76
      
https://github.com/qemu/qemu/commit/0f3ef1c0628d15e27b1cc4bf9fbd0e5532c59c76
  Author: Ross Zwisler <address@hidden>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M tests/acpi-test-data/q35/SSDT.dimmpxm

  Log Message:
  -----------
  hw/i386: Update SSDT table used by "make check"

This commit:

commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0")

updated the name used to create the q35 machine, which in turn changed the
SSDT table which is generated when we run "make check":

  acpi-test: Warning! SSDT mismatch. Actual [asl:/tmp/asl-QZDWJZ.dsl,
  aml:/tmp/aml-T8JYJZ], Expected [asl:/tmp/asl-DTWVJZ.dsl,
  aml:tests/acpi-test-data/q35/SSDT.dimmpxm].

Here's the only difference, aside from the checksum:

  <     Name (MEMA, 0x07FFF000)
  ---
  >     Name (MEMA, 0x07FFE000)

Update the binary table that we compare against so it reflects this name
change.

Signed-off-by: Ross Zwisler <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Thomas Huth <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Fixes: commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0")
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 11c39b5cd966ddc067a1ca0c5392ec9b666c45b7
      
https://github.com/qemu/qemu/commit/11c39b5cd966ddc067a1ca0c5392ec9b666c45b7
  Author: Ross Zwisler <address@hidden>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M docs/nvdimm.txt
    M hw/acpi/nvdimm.c
    M hw/i386/pc.c
    M include/hw/i386/pc.h
    M include/hw/mem/nvdimm.h
    M tests/bios-tables-test.c

  Log Message:
  -----------
  nvdimm: make persistence option symbolic

Replace the "nvdimm-cap" option which took numeric arguments such as "2"
with a more user friendly "nvdimm-persistence" option which takes symbolic
arguments "cpu" or "mem-ctrl".

Signed-off-by: Ross Zwisler <address@hidden>
Suggested-by: Michael S. Tsirkin <address@hidden>
Suggested-by: Dan Williams <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 59f3a1c6ac72cad98486c50ae23afe7d0abdde2c
      
https://github.com/qemu/qemu/commit/59f3a1c6ac72cad98486c50ae23afe7d0abdde2c
  Author: Peter Maydell <address@hidden>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M docs/nvdimm.txt
    M hw/acpi/nvdimm.c
    M hw/i386/pc.c
    M include/hw/i386/pc.h
    M include/hw/mem/nvdimm.h
    M tests/acpi-test-data/q35/SSDT.dimmpxm
    M tests/bios-tables-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc: fixes

A couple of fixes to acpi and nvdimm.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon 11 Jun 2018 20:21:03 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  nvdimm: make persistence option symbolic
  hw/i386: Update SSDT table used by "make check"

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/5eca450b2ec2...59f3a1c6ac72
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]