diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 15:09:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 15:09:33 +0000 |
| commit | fc1ec1acffd29d54c0c4266d30d38b2399d42f4f (patch) | |
| tree | 38dd37dda993a32ca05e05102bb1838769613a12 /hw/s390x/ipl.c | |
| parent | f16368459957603b8b3efa83353cc7e13ab6abd3 (diff) | |
| parent | 1834ed3afc578b8dbf39838cfdf27d457771a334 (diff) | |
| download | focaccia-qemu-fc1ec1acffd29d54c0c4266d30d38b2399d42f4f.tar.gz focaccia-qemu-fc1ec1acffd29d54c0c4266d30d38b2399d42f4f.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-02-11' into staging
trivial patches for 2016-02-11 # gpg: Signature made Thu 11 Feb 2016 12:16:04 GMT using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" * remotes/mjt/tags/pull-trivial-patches-2016-02-11: w32: include winsock2.h before windows.h Adds keycode 86 to the hid_usage_keys translation table. s390x: remove s390-zipl.rom Passthru CCID card: QOMify Emulated CCID card: QOMify ES1370: QOMify char: fix parameter name / type in BSD codepath qmp-spec: fix index in doc rdma: remove check on time_spent when calculating mbs qemu-sockets: simplify error handling cpu: cpu_save/cpu_load is no more qom: Correct object_property_get_int() description man: virtfs-proxy-helper: Rework awkward sentence remove libtool support Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/ipl.c')
| -rw-r--r-- | hw/s390x/ipl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 6992add8d3..c9cf7cce64 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -106,7 +106,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) /* Adjust ELF start address to final location */ ipl->bios_start_addr += fwbase; } else { - /* Try to load non-ELF file (e.g. s390-zipl.rom) */ + /* Try to load non-ELF file (e.g. s390-ccw.img) */ bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START, 4096); ipl->bios_start_addr = ZIPL_IMAGE_START; |