[Qemu-commits] [qemu/qemu] b372d7: MAINTAINERS: Add myself as vhost-user-blk maintainer

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b372d79b236a4e07eaa3ce65ee0543569b712326
      
https://github.com/qemu/qemu/commit/b372d79b236a4e07eaa3ce65ee0543569b712326
  Author: Raphael Norwitz <address@hidden>
  Date:   2020-04-13 (Mon, 13 Apr 2020)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add myself as vhost-user-blk maintainer

As suggested by Michael, let's add me as a maintainer of
vhost-user-blk and vhost-user-scsi.

CC: Michael S. Tsirkin <address@hidden>
CC Peter Maydell <address@hidden>
Signed-off-by: Raphael Norwitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: bac78f9c692ff397e365d552e390b674925bd243
      
https://github.com/qemu/qemu/commit/bac78f9c692ff397e365d552e390b674925bd243
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-04-13 (Mon, 13 Apr 2020)

  Changed paths:
    M hw/arm/virt-acpi-build.c
    M hw/i386/acpi-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: Use macro for table-loader file name

Use macro for "etc/table-loader" and move it to the header
file similar to ACPI_BUILD_TABLE_FILE/ACPI_BUILD_RSDP_FILE etc.

Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 394f0f72fd94595e656af62f079b7680cdbe8add
      
https://github.com/qemu/qemu/commit/394f0f72fd94595e656af62f079b7680cdbe8add
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-04-13 (Mon, 13 Apr 2020)

  Changed paths:
    M hw/core/machine.c
    M hw/nvram/fw_cfg.c
    M include/hw/nvram/fw_cfg.h

  Log Message:
  -----------
  fw_cfg: Migrate ACPI table mr sizes separately

Any sub-page size update to ACPI MRs will be lost during
migration, as we use aligned size in ram_load_precopy() ->
qemu_ram_resize() path. This will result in inconsistency in
FWCfgEntry sizes between source and destination. In order to avoid
this, save and restore them separately during migration.

Up until now, this problem may not be that relevant for x86 as both
ACPI table and Linker MRs gets padded and aligned. Also at present,
qemu_ram_resize() doesn't invoke callback to update FWCfgEntry for
unaligned size changes. But since we are going to fix the
qemu_ram_resize() in the subsequent patch, the issue may become
more serious especially for RSDP MR case.

Moreover, the issue will soon become prominent in arm/virt as well
where the MRs are not padded or aligned at all and eventually have
acpi table changes as part of future additions like NVDIMM hot-add
feature.

Suggested-by: David Hildenbrand <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
Acked-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ce4adc0b6e6167091373389ef8befd379c61fddb
      
https://github.com/qemu/qemu/commit/ce4adc0b6e6167091373389ef8befd379c61fddb
  Author: David Hildenbrand <address@hidden>
  Date:   2020-04-13 (Mon, 13 Apr 2020)

  Changed paths:
    M exec.c

  Log Message:
  -----------
  exec: Fix for qemu_ram_resize() callback

Summarizing the issue:
1. Memory regions contain ram blocks with a different size,  if the
   size is  not properly aligned. While memory regions can have an
   unaligned size, ram blocks can't. This is true when creating
   resizable memory region with  an unaligned size.
2. When resizing a ram block/memory region, the size of the memory
   region  is set to the aligned size. The callback is called with
   the aligned size. The unaligned piece is lost.

Because of the above, if ACPI blob length modifications happens
after the initial virt_acpi_build() call, and the changed blob
length is within the PAGE size boundary, then the revised size
is not seen by the firmware on Guest reboot.

Hence make sure callback is called if memory region size is changed,
irrespective of aligned or not.

Signed-off-by: David Hildenbrand <address@hidden>
[Shameer: added commit log]
Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 14e5526b51910efd62cd31cd95b49baca975c83f
      
https://github.com/qemu/qemu/commit/14e5526b51910efd62cd31cd95b49baca975c83f
  Author: Peter Maydell <address@hidden>
  Date:   2020-04-13 (Mon, 13 Apr 2020)

  Changed paths:
    M MAINTAINERS
    M exec.c
    M hw/arm/virt-acpi-build.c
    M hw/core/machine.c
    M hw/i386/acpi-build.c
    M hw/nvram/fw_cfg.c
    M include/hw/acpi/aml-build.h
    M include/hw/nvram/fw_cfg.h

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

pc: bugfixes, maintainers

A couple of bugfixes.
Add a new vhost-user-blk maintainer.

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

# gpg: Signature made Mon 13 Apr 2020 11:57:17 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# 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:
  exec: Fix for qemu_ram_resize() callback
  fw_cfg: Migrate ACPI table mr sizes separately
  acpi: Use macro for table-loader file name
  MAINTAINERS: Add myself as vhost-user-blk maintainer

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


Compare: https://github.com/qemu/qemu/compare/e33d61cc9aef...14e5526b5191