diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2014-12-03 19:04:02 +0000 |
|---|---|---|
| committer | root <root@ceth6.(none)> | 2014-12-22 14:39:21 +0800 |
| commit | ddcd55316fb2851e144e719171621ad2816487dc (patch) | |
| tree | 044aa422b6ce8b2a61d7b026ebb93a0c4e3a5bb2 /hw/sparc | |
| parent | 3b08098b409c0fb28f85436ba1adeb1d401ec8f7 (diff) | |
| download | qemu-ddcd55316fb2851e144e719171621ad2816487dc.tar.gz qemu-ddcd55316fb2851e144e719171621ad2816487dc.tar.bz2 qemu-ddcd55316fb2851e144e719171621ad2816487dc.zip | |
bootdevice: add Error **errp argument for QEMUBootSetHandler
It will be useful for checking when we change traditional
boot order dynamically and propagate error message
to the monitor.
For x86 architecture, we pass &local_err to set_boot_dev()
when vm startup in pc_coms_init().
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/sparc')
| -rw-r--r-- | hw/sparc/sun4m.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 8273199f11..df259ad605 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -121,10 +121,10 @@ void DMA_register_channel (int nchan, { } -static int fw_cfg_boot_set(void *opaque, const char *boot_device) +static void fw_cfg_boot_set(void *opaque, const char *boot_device, + Error **errp) { fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]); - return 0; } static void nvram_init(M48t59State *nvram, uint8_t *macaddr, |