diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2020-07-03 11:16:46 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2020-07-03 11:17:03 +0200 |
| commit | f196f6a8c7cca5e8bd1d6d37995447e1d6028223 (patch) | |
| tree | 10b6ad36acf06d9463f7c16867f04c90a2cc2f58 /pc-bios/s390-ccw/virtio-net.c | |
| parent | 45175361f1bfc2d3ccdcb4b22570c2352f3de754 (diff) | |
| parent | b71db6b9abb5af302c9669c133d78115c6437c45 (diff) | |
| download | qemu-f196f6a8c7cca5e8bd1d6d37995447e1d6028223.zip | |
Merge tag 's390-ccw-bios-2020-07-02' into s390-next-staging
* Source code clean-ups from Janosch
# gpg: Signature made Thu 02 Jul 2020 11:56:01 AM CEST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
* tag 's390-ccw-bios-2020-07-02':
pc-bios/s390: Update s390-ccw bios binaries with the latest changes
pc-bios/s390-ccw: Generate and include dependency files in the Makefile
pc-bios: s390x: Make u32 ptr check explicit
pc-bios: s390x: Use ebcdic2ascii table
pc-bios: s390x: Move panic() into header and add infinite loop
pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR
pc-bios: s390x: Rename PSW_MASK_ZMODE to PSW_MASK_64
pc-bios: s390x: Get rid of magic offsets into the lowcore
pc-bios: s390x: Move sleep and yield to helper.h
pc-bios: s390x: Consolidate timing functions into time.h
pc-bios: s390x: cio.c cleanup and compile fix
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'pc-bios/s390-ccw/virtio-net.c')
| -rw-r--r-- | pc-bios/s390-ccw/virtio-net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c index ff7f4dad25..2fcb0a58c5 100644 --- a/pc-bios/s390-ccw/virtio-net.c +++ b/pc-bios/s390-ccw/virtio-net.c @@ -19,6 +19,8 @@ #include <ethernet.h> #include "s390-ccw.h" #include "virtio.h" +#include "s390-time.h" +#include "helper.h" #ifndef DEBUG_VIRTIO_NET #define DEBUG_VIRTIO_NET 0 |