[Qemu-commits] [qemu/qemu] 09230c: specs/vhost-user: improve VHOST_SET_VRING_NUM docu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 09230cb8676bd4f18f919afe52dab32063adff5f
      
https://github.com/qemu/qemu/commit/09230cb8676bd4f18f919afe52dab32063adff5f
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M docs/specs/vhost-user.txt

  Log Message:
  -----------
  specs/vhost-user: improve VHOST_SET_VRING_NUM documentation

"number of vrings" doesn't help me understand the purpose of this
message. My understanding is that it is rather the size of the queue (in
modern terms).

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c954f09ee5465adb03a95320e9156e2117e09603
      
https://github.com/qemu/qemu/commit/c954f09ee5465adb03a95320e9156e2117e09603
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M docs/specs/vhost-user.txt

  Log Message:
  -----------
  specs/vhost-user: spelling fix

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 2b1c2e8e5f1990f0a201a8cbf9d366fca60f4aa8
      
https://github.com/qemu/qemu/commit/2b1c2e8e5f1990f0a201a8cbf9d366fca60f4aa8
  Author: Igor Mammedov <address@hidden>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

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

  Log Message:
  -----------
  pc: acpi: tpm: add missing MMIO resource to PCI0._CRS

Windows will fail initialize TMP driver with the reason:
  'device cannot find enough free resources'
That happens because parent BUS doesn't describe
MMIO resources used by TPM child device.
Fix it by describing it in top-most parent bus scope PCI0.

It was 'regressed' by commit
  5cb18b3d TPM2 ACPI table support
with following fixup
  9e472263 acpi: add missing ssdt
which did the right thing by moving TPM to BUS
it belongs to but lacked a proper resource declaration.

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


  Commit: 52e38eb0512585a5fadb431a65997b602d44874b
      
https://github.com/qemu/qemu/commit/52e38eb0512585a5fadb431a65997b602d44874b
  Author: Igor Mammedov <address@hidden>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

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

  Log Message:
  -----------
  tpm: acpi: remove IRQ from TPM's CRS to make Windows not see conflict

IRQ 5 used by TPM conflicts with PNP0C0F IRQs,
as result Windows fails driver initialization with reason
  'device cannot find enough free resources'
But if TPM._CRS.IRQ entry is commented out, Windows
seems to initialize driver without errors as it doesn't
notice possible conflict and it seems to work
probably due to a link with IRQ 5 being unused/disabled.

So temporary comment out TPM._CRS.IRQ to 'fix'
regression in TPM, with intent to fix it correctly
later i.e.:
  1. pick unused IRQ as default one for TPM
  2. fetch IRQ value from device model so that user
     could override default one if it conflicts with
     some other device.

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


  Commit: e7658fcc4c29a29c578acde26f7714023b93b46e
      
https://github.com/qemu/qemu/commit/e7658fcc4c29a29c578acde26f7714023b93b46e
  Author: Stefan Berger <address@hidden>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M hw/tpm/tpm_passthrough.c

  Log Message:
  -----------
  tpm: Fix write to file descriptor function

Fix a bug introduced in commit 46f296c while moving send_all to the
tpm_passthrough code. Fix the name of the variable used in the loop.

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


  Commit: 01310e2aa7ad87f101d56feb8c06898084c9b542
      
https://github.com/qemu/qemu/commit/01310e2aa7ad87f101d56feb8c06898084c9b542
  Author: Thomas Huth <address@hidden>
  Date:   2016-04-14 (Thu, 14 Apr 2016)

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

  Log Message:
  -----------
  hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE

The balloon code currently calls madvise() with TARGET_PAGE_SIZE as
length parameter. Since the virtio-balloon protocol is always based
on 4k pages, no matter what the host and guest are using as page size,
this could cause problems: If TARGET_PAGE_SIZE is bigger than 4k, the
madvise call also destroys the 4k areas after the current one - which
might be wrong since the guest did not want free that area yet (in
case the guest used as smaller MMU page size than the hard-coded
TARGET_PAGE_SIZE). So to fix this issue, introduce a proper define
called BALLOON_PAGE_SIZE (which is 4096) to use this as the size
parameter for the madvise() call instead.

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


  Commit: 3e7cac31d6079b1642321bd8bab8ca8e0f431929
      
https://github.com/qemu/qemu/commit/3e7cac31d6079b1642321bd8bab8ca8e0f431929
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-14 (Thu, 14 Apr 2016)

  Changed paths:
    M docs/specs/vhost-user.txt
    M hw/i386/acpi-build.c
    M hw/tpm/tpm_passthrough.c
    M hw/virtio/virtio-balloon.c

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

tpm, vhost, virtio: fixes for 2.6

Minor fixes all over the place.

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

# gpg: Signature made Thu 14 Apr 2016 14:45:55 BST 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:
  hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE
  tpm: Fix write to file descriptor function
  tpm: acpi: remove IRQ from TPM's CRS to make Windows not see conflict
  pc: acpi: tpm: add missing MMIO resource to PCI0._CRS
  specs/vhost-user: spelling fix
  specs/vhost-user: improve VHOST_SET_VRING_NUM documentation

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


Compare: https://github.com/qemu/qemu/compare/33e570288985...3e7cac31d607