[Qemu-commits] [qemu/qemu] b4f4d5: acpi: make SSDT 1.0 spec compliant when possible

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b4f4d54812624581ce429c805e5179c78222c707
      
https://github.com/qemu/qemu/commit/b4f4d54812624581ce429c805e5179c78222c707
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi: make SSDT 1.0 spec compliant when possible

The ACPI specification says:

The ASL compiler can emit two different AML opcodes for a Package
declaration, either PackageOp or VarPackageOp. For small, fixed-length
packages, the PackageOp is used and this opcode is compatible with ACPI
1.0. A VarPackageOp will be emitted if any of the following conditions
are true:
. The NumElements argument is a TermArg that can only be resolved at
runtime.
. At compile time, NumElements resolves to a constant that is larger than
255.
. The PackageList contains more than 255 initializer elements.
Note: The ability to create variable-sized packages was first introduced
in ACPI 2.0. ACPI 1.0 only allowed fixed-size packages with up to 255 elements.

So the spec seems to say a fixed value up to 255 must always
be used with PackageOp and not VarPackageOp, and some guests
(windows up to win2k8) seem to interpret it like this.

Let's do just this, choosing the encoding depending on
the number of elements.

Fixes 9bcc80cd71892df42605e0c097d85c0237ff45d1
(i386/acpi-build: allow more than 255 elements in CPON).

https://bugs.launchpad.net/bugs/1297651

Reported-by: Robert Hu <address@hidden>
Cc: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 53a786acac7b4d53288d603504021d928f734513
      
https://github.com/qemu/qemu/commit/53a786acac7b4d53288d603504021d928f734513
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

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

  Log Message:
  -----------
  Revert "acpi-test: rebuild SSDT"

This reverts commit d07e0e9cddf02dd2abedbbf7ab0e069c8f5dabfd.

Since
commit b4f4d54812624581ce429c805e5179c78222c707
    acpi: make SSDT 1.0 spec compliant when possible
We are back to old encoding.

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


  Commit: 0b1eaa8803e680de9a05727355dfe3d306b81e17
      
https://github.com/qemu/qemu/commit/0b1eaa8803e680de9a05727355dfe3d306b81e17
  Author: Stefan Fritsch <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: Do not filter VLANs without F_CTRL_VLAN

If VIRTIO_NET_F_CTRL_VLAN is not negotiated, do not filter out all
VLAN-tagged packets but send them to the guest.

This fixes VLANs with OpenBSD guests (and probably NetBSD, too, because
the OpenBSD driver started as a port from NetBSD).

Signed-off-by: Stefan Fritsch <address@hidden>
Signed-off-by: Amos Kong <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f7bc8ef8091229a4bec0e2a40af90abb8dcb3834
      
https://github.com/qemu/qemu/commit/f7bc8ef8091229a4bec0e2a40af90abb8dcb3834
  Author: Amos Kong <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/net/virtio-net.c
    M qapi-schema.json
    M qmp-commands.hx

  Log Message:
  -----------
  virtio-net: add vlan receive state to RxFilterInfo

Stefan Fritsch just fixed a virtio-net driver bug [1], virtio-net won't
filter out VLAN-tagged packets if VIRTIO_NET_F_CTRL_VLAN isn't negotiated.

This patch added a new field to @RxFilterInfo to indicate vlan receive
state ('normal', 'none', 'all'). If VIRTIO_NET_F_CTRL_VLAN isn't
negotiated, vlan receive state will be 'all', then all VLAN-tagged packets
will be received by guest.

This patch also fixed a boundary issue in visiting vlan table.

[1] http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg02604.html

Signed-off-by: Amos Kong <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 0a87466ef3fe3d9a062195f801727569ab886bde
      
https://github.com/qemu/qemu/commit/0a87466ef3fe3d9a062195f801727569ab886bde
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/net/virtio-net.c
    M qapi-schema.json
    M qmp-commands.hx
    M tests/acpi-test-data/pc/SSDT
    M tests/acpi-test-data/q35/SSDT

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

acpi,virtio bug fixes

Two bugfixes for virtio-net, and one for a recent
regression in acpi.
Both issues have been reported in the wild, so
I think it's preferable to merge these ASAP so
that reporters can make sure RC fixes their issue.

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

# gpg: Signature made Wed 26 Mar 2014 10:52:16 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  virtio-net: add vlan receive state to RxFilterInfo
  virtio-net: Do not filter VLANs without F_CTRL_VLAN
  Revert "acpi-test: rebuild SSDT"
  acpi: make SSDT 1.0 spec compliant when possible

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


Compare: https://github.com/qemu/qemu/compare/0acf0a50c8ae...0a87466ef3fe