[Qemu-commits] [qemu/qemu] 6078a0: tests/multiboot: Fix load address of test kernels

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6078a0b64f23b40a9f5405bb39662412f536d7d6
      
https://github.com/qemu/qemu/commit/6078a0b64f23b40a9f5405bb39662412f536d7d6
  Author: Kevin Wolf <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M tests/multiboot/link.ld

  Log Message:
  -----------
  tests/multiboot: Fix load address of test kernels

While older toolchains produced binaries where the physical load address
of ELF segments was the same as the virtual address, newer versions seem
to choose a different physical address if it isn't specified explicitly.
The means that the test kernel doesn't use the right addresses to access
e.g. format strings any more and the whole output disappears, causing
all test cases to fail.

Fix this by specifying the physical load address of sections explicitly.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 251071e0c0a0121e46fb1cc9c7a7fffba8dbbcd4
      
https://github.com/qemu/qemu/commit/251071e0c0a0121e46fb1cc9c7a7fffba8dbbcd4
  Author: Andrey Shinkevich <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M tests/qemu-iotests/051.out

  Log Message:
  -----------
  Fixes: add read-zeroes to 051.out

The patch "iotests: Set read-zeroes on in null block driver for Valgrind"
with the commit ID a6862418fec4072 needs the change in 051.out when
compared against on the s390 system.

Fixes: a6862418fec40727b392c86dc13d9ec980efcb15
Reported-by: Christian Borntraeger <address@hidden>
Signed-off-by: Andrey Shinkevich <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 2b23f28639c9ed3d4cdb1262b3e41b6b81be5e0b
      
https://github.com/qemu/qemu/commit/2b23f28639c9ed3d4cdb1262b3e41b6b81be5e0b
  Author: Kevin Wolf <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M block/copy-on-read.c

  Log Message:
  -----------
  block/copy-on-read: Fix permissions for inactive node

The copy-on-read drive must not request the WRITE_UNCHANGED permission
for its child if the node is inactive, otherwise starting a migration
destination with -incoming will fail because the child cannot provide
write access yet:

  qemu-system-x86_64: -blockdev copy-on-read,file=img,node-name=cor: Block node 
is read-only

Earlier QEMU versions additionally ran into an abort() on the migration
source side: bdrv_inactivate_recurse() failed to update permissions.
This is silently ignored today because it was only supposed to loosen
restrictions. This is the symptom that was originally reported here:

  https://bugzilla.redhat.com/show_bug.cgi?id=1733022

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 7cef3d1290c9d675deff95029ba78e51fb727125
      
https://github.com/qemu/qemu/commit/7cef3d1290c9d675deff95029ba78e51fb727125
  Author: Kevin Wolf <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/scsi/scsi-disk.c

  Log Message:
  -----------
  scsi-cd: Fix inserting read-only media in empty drive

scsi-disks decides whether it has a read-only device by looking at
whether the BlockBackend specified as drive=... is read-only. In the
case of an anonymous BlockBackend (with a node name specified in
drive=...), this is the read-only flag of the attached node. In the case
of an empty anonymous BlockBackend, it's always read-write because
nothing prevented it from being read-write.

This is a problem because scsi-cd would take write permissions on the
anonymous BlockBackend of an empty drive created without a drive=...
option. Using blockdev-insert-medium with a read-only node fails then
with the error message "Block node is read-only".

Fix scsi_realize() so that scsi-cd devices always take read-only
permissions on their BlockBackend instead.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1733920
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 6e9a6cbe7d56107f5e0d7711905dc19bb4d7e3f0
      
https://github.com/qemu/qemu/commit/6e9a6cbe7d56107f5e0d7711905dc19bb4d7e3f0
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M block/copy-on-read.c
    M hw/scsi/scsi-disk.c
    M tests/multiboot/link.ld
    M tests/qemu-iotests/051.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- scsi-cd: Fix inserting read-only media in empty drive
- block/copy-on-read: Fix permissions for inactive node
- Test case fixes

# gpg: Signature made Tue 30 Jul 2019 12:21:48 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  scsi-cd: Fix inserting read-only media in empty drive
  block/copy-on-read: Fix permissions for inactive node
  Fixes: add read-zeroes to 051.out
  tests/multiboot: Fix load address of test kernels

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


Compare: https://github.com/qemu/qemu/compare/ee9545ed1543...6e9a6cbe7d56