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/ppc/mac_oldworld.c | |
| parent | 3b08098b409c0fb28f85436ba1adeb1d401ec8f7 (diff) | |
| download | focaccia-qemu-ddcd55316fb2851e144e719171621ad2816487dc.tar.gz focaccia-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_oldworld.c')
| -rw-r--r-- | hw/ppc/mac_oldworld.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 32c21a4286..15109c294a 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -49,13 +49,12 @@ #define CLOCKFREQ 266000000UL #define BUSFREQ 66000000UL -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) { return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; |