[Qemu-commits] [qemu/qemu] e555cb: target/s390x: change CPU type name to "s390x-cpu"

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e555cbe78d59f09f7e7db7703d1e91b95f2743c0
      
https://github.com/qemu/qemu/commit/e555cbe78d59f09f7e7db7703d1e91b95f2743c0
  Author: David Hildenbrand <address@hidden>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M qapi-schema.json
    M target/s390x/cpu-qom.h
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  target/s390x: change CPU type name to "s390x-cpu"

For now, e.g. host-s390-cpu wasn't exposed to the user. cpu-add, -cpu
and the CPU model qmp interfaces didn't care about the actual type,
as that information was hidden.

This changed with CPU hotplug via device_add. Now the type is visible to
the user. Before we get that supported in a stable version, this is our
last chance to change it.

So change it from "s390-cpu" to "s390x-cpu", to match the architecture
name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 0280b3eb7c0519b43452c05cf51f8777d9e38975
      
https://github.com/qemu/qemu/commit/0280b3eb7c0519b43452c05cf51f8777d9e38975
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-virtio-ccw.h
    M target/s390x/kvm.c
    M target/s390x/machine.c

  Log Message:
  -----------
  s390x/kvm: use cpu model for gscb on compat machines

Starting a guest with
   <os>
    <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type>
  </os>
  <cpu mode='host-model'/>

on an IBM z14 results in

"qemu-system-s390x: Some features requested in the CPU model are not
available in the configuration: gs"

This is because guarded storage is fenced for compat machines that did
not have guarded storage support. While this prevents future migration
abort (by not starting the guest at all), not being able to start a
"host-model" guest is very much unexpected.  As it turns out, even if we
would modify libvirt to not expand the cpu model to contain "gs" for
compat machines, it cannot guarantee that a migration will succeed. For
example if the kernel changes its features (or the user has nested=1 on
one host but not on the other) the migration will fail nevertheless.  So
instead of fencing "gs" for machines <= 2.9 lets allow it for all
machine types that support the CPU model. This will make "host-model"
runnable all the time, while relying on the CPU model to reject invalid
migration attempts. We also need to change the migration for guarded
storage.
Additional discussions about host-model are still pending but are out
of scope of this patch.

Suggested-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: David Hildenbrand <address@hidden>
Acked-by: Cornelia Huck <Cornelia Huck <address@hidden>
Acked-by: Halil Pasic <address@hidden>


  Commit: 7618c0aefed1dd687539de0606111356dd02b4dc
      
https://github.com/qemu/qemu/commit/7618c0aefed1dd687539de0606111356dd02b4dc
  Author: Collin L. Walling <address@hidden>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M pc-bios/s390-ccw/sclp.c

  Log Message:
  -----------
  s390-ccw: print carriage return with new lines

The sclp console in the s390 bios writes raw data,
leading console emulators (such as virsh console) to
treat a new line ('\n') as just a new line instead
of as a Unix line feed. Because of this, output
appears in a "stair case" pattern.

Let's print \r\n on every occurrence of a new line
in the string passed to write to amend this issue.

This is in sync with the guest Linux code in
drivers/s390/char/sclp_vt220.c which also does a line feed
conversion in the console part of the driver.

This fixes the s390-ccw and s390-netboot output like
$ virsh start test --console
Domain test started
Connected to domain test
Escape character is ^]
Network boot starting...
                    Using MAC address: 02:01:02:03:04:05
                                                          Requesting 
information via DHCP:  010

Signed-off-by: Collin L. Walling <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 7a4ec18d117d74eedccdadca882331b928135465
      
https://github.com/qemu/qemu/commit/7a4ec18d117d74eedccdadca882331b928135465
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  s390-*.img: update s390 bios with latest fixes

includes
7618c0aefed1 ("s390-ccw: print carriage return with new lines")
a8fbbf1db7a3 ("s390: set DHCP client architecure id for netboot")

Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: abf6e752e55b2f5afb48303429dea2db7c3a62de
      
https://github.com/qemu/qemu/commit/abf6e752e55b2f5afb48303429dea2db7c3a62de
  Author: Peter Maydell <address@hidden>
  Date:   2017-10-30 (Mon, 30 Oct 2017)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-virtio-ccw.h
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/sclp.c
    M pc-bios/s390-netboot.img
    M qapi-schema.json
    M target/s390x/cpu-qom.h
    M target/s390x/cpu_models.c
    M target/s390x/kvm.c
    M target/s390x/machine.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into 
staging

s390x: fixups for 2.11

- missing \r in the BIOS console output
- CPU type name is now "s390x-cpu"
- fixup for the host-model on z14 and older machine versions

# gpg: Signature made Mon 30 Oct 2017 08:34:15 GMT
# gpg:                using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <address@hidden>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20171030:
  s390-*.img: update s390 bios with latest fixes
  s390-ccw: print carriage return with new lines
  s390x/kvm: use cpu model for gscb on compat machines
  target/s390x: change CPU type name to "s390x-cpu"

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


Compare: https://github.com/qemu/qemu/compare/21dab18b53f3...abf6e752e55b