diff options
| author | Fan Zhang <zhangfan@linux.vnet.ibm.com> | 2015-02-12 18:02:13 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-02-13 16:14:09 +0100 |
| commit | f0180f913e3bcd04cb132f5f6036e823a78e0673 (patch) | |
| tree | 47a31ccd3dbf847c4104d0e159809c8c72142665 /hw/s390x/s390-virtio.h | |
| parent | cd2d5541271f1934345d8ca42f5fafff1744eee7 (diff) | |
| download | qemu-f0180f913e3bcd04cb132f5f6036e823a78e0673.zip qemu-f0180f913e3bcd04cb132f5f6036e823a78e0673.tar.gz qemu-f0180f913e3bcd04cb132f5f6036e823a78e0673.tar.bz2 | |
s390x/ipl: always load the bios for ccw machine
We will need bios support in order to be able to support selecting a
different boot device via diagnose 308 in the ccw machine, so let's
make the bios mandatory for the ccw machine.
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Fan Zhang <zhangfan@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'hw/s390x/s390-virtio.h')
| -rw-r--r-- | hw/s390x/s390-virtio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h index 33847ae..75b67ed 100644 --- a/hw/s390x/s390-virtio.h +++ b/hw/s390x/s390-virtio.h @@ -26,7 +26,8 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys); void s390_init_ipl_dev(const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, - const char *firmware); + const char *firmware, + bool enforce_bios); void s390_create_virtio_net(BusState *bus, const char *name); void s390_nmi(NMIState *n, int cpu_index, Error **errp); #endif |