qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 7a5342: virtio-ccw: clean up notify


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 7a5342: virtio-ccw: clean up notify
Date: Wed, 20 Jun 2018 02:52:09 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7a5342e7ccf2deb5553951024d57ec1327c926dd
      
https://github.com/qemu/qemu/commit/7a5342e7ccf2deb5553951024d57ec1327c926dd
  Author: Halil Pasic <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M hw/s390x/virtio-ccw.c

  Log Message:
  -----------
  virtio-ccw: clean up notify

Coverity recently started complaining about virtio_ccw_notify().  Turns
out, there is a couple of things that can be cleaned up.  Let's clean!

Reported-by: Peter Maydell <address@hidden>
Fixes: CID 1390619
Signed-off-by: Halil Pasic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 9a51c9ee6ca6610e4ab89945e6c75eda3a265ceb
      
https://github.com/qemu/qemu/commit/9a51c9ee6ca6610e4ab89945e6c75eda3a265ceb
  Author: Halil Pasic <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M hw/s390x/css.c
    M hw/vfio/ccw.c

  Log Message:
  -----------
  vfio-ccw: add force unlimited prefetch property

There is at least one guest (OS) such that although it does not rely on
the guarantees provided by ORB 1 word 9 bit (aka unlimited prefetch, aka
P bit) not being set, it fails to tell this to the machine.

Usually this ain't a big deal, as the original purpose of the P bit is to
allow for performance optimizations. vfio-ccw however can not provide the
guarantees required if the bit is not set.

It is not possible to implement support for the P bit not set without
transitioning to lower level protocols for vfio-ccw.  So let's give the
user the opportunity to force setting the P bit, if the user knows this
is safe.  For self modifying channel programs forcing the P bit is not
safe.  If the P bit is forced for a self modifying channel program things
are expected to break in strange ways.

Let's also avoid warning multiple about P bit not set in the ORB in case
P bit is not told to be forced, and designate the affected vfio-ccw
device.

Signed-off-by: Halil Pasic <address@hidden>
Suggested-by: Dong Jia Shi <address@hidden>
Acked-by: Jason J. Herne <address@hidden>
Tested-by: Jason J. Herne <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ea2dd691e21f2ca4896d3a88835b52f78012801d
      
https://github.com/qemu/qemu/commit/ea2dd691e21f2ca4896d3a88835b52f78012801d
  Author: Halil Pasic <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  vfio-ccw: remove orb.c64 (64 bit data addresses) check

The vfio-ccw module does the check too, and there is actually no
technical obstacle for supporting fmt 1 idaws. Let us be ready for the
beautiful day when fmt 1 idaws become supported by the vfio-ccw kernel
module. QEMU does not have to do a thing for that, except not insisting
on this check.

Signed-off-by: Halil Pasic <address@hidden>
Acked-by: Jason J. Herne <address@hidden>
Tested-by: Jason J. Herne <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: acd7ef837d8987ad4ef2ab8f8e8c0f13ab413dd5
      
https://github.com/qemu/qemu/commit/acd7ef837d8987ad4ef2ab8f8e8c0f13ab413dd5
  Author: Christian Borntraeger <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M hw/s390x/ipl.c

  Log Message:
  -----------
  s390x/ipl: Try to detect Linux vs non Linux for initial IPL PSW

Right now the IPL device always starts from address 0x10000 (the usual
Linux entry point). To run other guests (e.g. test programs) it is
useful to use the IPL PSW from address 0. We can use the Linux magic
at 0x10008 to decide.

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


  Commit: 23ad956bff98d949057156ea3f68a9763c2dda0e
      
https://github.com/qemu/qemu/commit/23ad956bff98d949057156ea3f68a9763c2dda0e
  Author: Christian Borntraeger <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  s390x/cpumodels: add z14 Model ZR1

Introduce the new z14 Model ZR1 cpu model. Mostly identical to z14, only
the cpu type differs (3906 vs. 3907)

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


  Commit: a0e11b617b9ef41cefe8739dff4d6a7b01ca967f
      
https://github.com/qemu/qemu/commit/a0e11b617b9ef41cefe8739dff4d6a7b01ca967f
  Author: Collin Walling <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: define loadparm length

Loadparm is defined by the s390 architecture to be 8 bytes
in length. Let's define this size in the s390-ccw bios.

Suggested-by: Laszlo Ersek <address@hidden>
Signed-off-by: Collin Walling <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 4248981d5190eaf2b0ab74d8c287b6070ffc300a
      
https://github.com/qemu/qemu/commit/4248981d5190eaf2b0ab74d8c287b6070ffc300a
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M roms/SLOF

  Log Message:
  -----------
  roms: Update SLOF submodule to current status

We need the latest version of SLOF's libnet for adding pxelinux.cfg
support in the s390-ccw bios, too.

Signed-off-by: Thomas Huth <address@hidden>


  Commit: 134f0b3d7ca5fbbd17f21fea87066967ce1d6de5
      
https://github.com/qemu/qemu/commit/134f0b3d7ca5fbbd17f21fea87066967ce1d6de5
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/s390-ccw/netmain.c

  Log Message:
  -----------
  pc-bios/s390-ccw/net: Update code for the latest changes in SLOF

The ip_version information now has to be stored in the filename_ip_t
structure, and there is now a common function called tftp_get_error_info()
which can be used to get the error string for a TFTP error code.
We can also get rid of some superfluous "(char *)" casts now.

Acked-by: Christian Borntraeger <address@hidden>
Tested-by: Viktor Mihajlovski <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: ec623990b34ab0e271141356af96d67a0c4e980d
      
https://github.com/qemu/qemu/commit/ec623990b34ab0e271141356af96d67a0c4e980d
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/s390-ccw/netmain.c

  Log Message:
  -----------
  pc-bios/s390-ccw/net: Add support for pxelinux-style config files

Since it is quite cumbersome to manually create a combined kernel with
initrd image for network booting, we now support loading via pxelinux
configuration files, too. In these files, the kernel, initrd and command
line parameters can be specified seperately, and the firmware then takes
care of glueing everything together in memory after the files have been
downloaded. See this URL for details about the config file layout:
https://www.syslinux.org/wiki/index.php?title=PXELINUX

The user can either specify a config file directly as bootfile via DHCP
(but in this case, the file has to start either with "default" or a "#"
comment so we can distinguish it from binary kernels), or a folder (i.e.
the bootfile name must end with "/") where the firmware should look for
the typical pxelinux.cfg file names, e.g. based on MAC or IP address.
We also support the pxelinux.cfg DHCP options 209 and 210 from RFC 5071.

Acked-by: Christian Borntraeger <address@hidden>
Tested-by: Viktor Mihajlovski <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 0d8261b506933c245b79ca6a57422dc81d8989c1
      
https://github.com/qemu/qemu/commit/0d8261b506933c245b79ca6a57422dc81d8989c1
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  pc-bios/s390-ccw/net: Try to load pxelinux.cfg file accoring to the UUID

With the STSI instruction, we can get the UUID of the current VM instance,
so we can support loading pxelinux config files via UUID in the file name,
too.

Acked-by: Christian Borntraeger <address@hidden>
Tested-by: Viktor Mihajlovski <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 63c93fac18546ef9468c7b522bad0ae43f9f58ba
      
https://github.com/qemu/qemu/commit/63c93fac18546ef9468c7b522bad0ae43f9f58ba
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Optimize the s390-netboot.img for size

The -O2 optimization flag is passed via CFLAGS to the firmware Makefile,
but in netbook.mak, we've got some rules that only use QEMU_CFLAGS for
compiling the libc and libnet from SLOF, so these files get compiled
without optimization so far. Use CFLAGS here, too, to create faster
and smaller code.

We can additionally save some more bytes in the firmware images by compi-
ling the code with -fno-asynchronous-unwind-tables. This will omit some
ELF sections (used for stack unwinding for example) from the image that
we do not need in the firmware.

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


  Commit: 4046826d46618ef7eb11df41fe8878669ce6991c
      
https://github.com/qemu/qemu/commit/4046826d46618ef7eb11df41fe8878669ce6991c
  Author: Thomas Huth <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Update the s390-netboot.img binary

This binary now contains the support for pxelinux.cfg-style network
booting.

Signed-off-by: Thomas Huth <address@hidden>


  Commit: 49b67e9440892179c016a7afd33725a50d995ba6
      
https://github.com/qemu/qemu/commit/49b67e9440892179c016a7afd33725a50d995ba6
  Author: Cornelia Huck <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/iplb.h
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/s390-ccw/netmain.c
    M pc-bios/s390-ccw/sclp.c
    M pc-bios/s390-ccw/sclp.h
    M pc-bios/s390-netboot.img
    M roms/SLOF

  Log Message:
  -----------
  Merge tag 'tags/s390x-2018-06-18' into staging

Add support for pxelinux.cfg-style network booting to the s390x firmware

# gpg: Signature made Mon 18 Jun 2018 03:59:06 PM CEST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [undefined]
# gpg:                 aka "Thomas Huth <address@hidden>" [undefined]
# gpg:                 aka "Thomas Huth <address@hidden>" [unknown]

* tag 'tags/s390x-2018-06-18':
  pc-bios/s390-ccw: Update the s390-netboot.img binary
  pc-bios/s390-ccw: Optimize the s390-netboot.img for size
  pc-bios/s390-ccw/net: Try to load pxelinux.cfg file accoring to the UUID
  pc-bios/s390-ccw/net: Add support for pxelinux-style config files
  pc-bios/s390-ccw/net: Update code for the latest changes in SLOF
  roms: Update SLOF submodule to current status
  pc-bios/s390-ccw: define loadparm length

Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 46012db666990ff2eed1d3dc199ab8006439a93b
      
https://github.com/qemu/qemu/commit/46012db666990ff2eed1d3dc199ab8006439a93b
  Author: Peter Maydell <address@hidden>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/ipl.c
    M hw/s390x/virtio-ccw.c
    M hw/vfio/ccw.c
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/iplb.h
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/s390-ccw/netmain.c
    M pc-bios/s390-ccw/sclp.c
    M pc-bios/s390-ccw/sclp.h
    M pc-bios/s390-netboot.img
    M roms/SLOF
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180619' into staging

- cleanup in virtio-ccw
- accommodate guests using vfio-ccw without specifying unlimited
  prefetch, but actually working fine
- add cpu model for the z14 Model ZR1
- add support for pxelinux.cfg-style network booting to the s390x
  firmware

# gpg: Signature made Tue 19 Jun 2018 10:33:06 BST
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180619:
  pc-bios/s390-ccw: Update the s390-netboot.img binary
  pc-bios/s390-ccw: Optimize the s390-netboot.img for size
  pc-bios/s390-ccw/net: Try to load pxelinux.cfg file accoring to the UUID
  pc-bios/s390-ccw/net: Add support for pxelinux-style config files
  pc-bios/s390-ccw/net: Update code for the latest changes in SLOF
  roms: Update SLOF submodule to current status
  pc-bios/s390-ccw: define loadparm length
  s390x/cpumodels: add z14 Model ZR1
  s390x/ipl: Try to detect Linux vs non Linux for initial IPL PSW
  vfio-ccw: remove orb.c64 (64 bit data addresses) check
  vfio-ccw: add force unlimited prefetch property
  virtio-ccw: clean up notify

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


Compare: https://github.com/qemu/qemu/compare/eee4baef4ac2...46012db66699
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]