diff options
| author | Gonglei | 2014-12-03 20:04:02 +0100 |
|---|---|---|
| committer | root | 2014-12-22 07:39:21 +0100 |
| commit | ddcd55316fb2851e144e719171621ad2816487dc (patch) | |
| tree | 044aa422b6ce8b2a61d7b026ebb93a0c4e3a5bb2 /hw/ppc/mac_newworld.c | |
| parent | bootdevice: add validate check for qemu_boot_set() (diff) | |
| download | qemu-ddcd55316fb2851e144e719171621ad2816487dc.tar.gz qemu-ddcd55316fb2851e144e719171621ad2816487dc.tar.xz 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/ppc/mac_newworld.c')
| -rw-r--r-- | hw/ppc/mac_newworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 89aee716d4..ee1ed8a344 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -116,10 +116,10 @@ static const MemoryRegionOps unin_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -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 uint64_t translate_kernel_address(void *opaque, uint64_t addr) |