ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xbox,chihiro: Fixup object property errp and parameter ordering 

See the following commits for more info:
- qom: Drop parameter @errp of object_property_add() & friends
- qom: Put name parameter before value / visitor parameter
This commit is contained in:
Matt Borgerson 2020-08-25 14:44:56 -07:00
parent 4c0ea64b26
commit 49b1750bac
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xbox/chihiro.c
View File

@ -388,15 +388,15 @@ static inline void chihiro_machine_initfn(Object *obj)
{
object_property_add_str(obj, "mediaboard-rom",
machine_get_mediaboard_rom,
machine_set_mediaboard_rom, NULL);
machine_set_mediaboard_rom);
object_property_set_description(obj, "mediaboard-rom",
"Chihiro mediaboard ROM", NULL);
"Chihiro mediaboard ROM");
object_property_add_str(obj, "mediaboard-filesystem",
machine_get_mediaboard_filesystem,
machine_set_mediaboard_filesystem, NULL);
machine_set_mediaboard_filesystem);
object_property_set_description(obj, "mediaboard-filesystem",
"Chihiro mediaboard filesystem", NULL);
"Chihiro mediaboard filesystem");
}
static void chihiro_machine_class_init(ObjectClass *oc, void *data)

21
hw/xbox/xbox.c
View File

@ -530,28 +530,27 @@ static bool machine_get_short_animation(Object *obj, Error **errp)
static inline void xbox_machine_initfn(Object *obj)
{
object_property_add_str(obj, "bootrom", machine_get_bootrom,
machine_set_bootrom, NULL);
machine_set_bootrom);
object_property_set_description(obj, "bootrom",
"Xbox bootrom file", NULL);
"Xbox bootrom file");
object_property_add_str(obj, "eeprom", machine_get_eeprom,
machine_set_eeprom, NULL);
machine_set_eeprom);
object_property_set_description(obj, "eeprom",
"Xbox EEPROM file", NULL);
"Xbox EEPROM file");
object_property_add_str(obj, "avpack", machine_get_avpack,
machine_set_avpack, NULL);
machine_set_avpack);
object_property_set_description(obj, "avpack",
"Xbox video connector: composite (default), scart, svideo, vga, rfu, hdtv, none", NULL);
object_property_set_str(obj, "composite", "avpack", NULL);
"Xbox video connector: composite (default), scart, svideo, vga, rfu, hdtv, none");
object_property_set_str(obj, "avpack", "composite", &error_fatal);
object_property_add_bool(obj, "short-animation",
machine_get_short_animation,
machine_set_short_animation, NULL);
machine_set_short_animation);
object_property_set_description(obj, "short-animation",
"Skip Xbox boot animation",
NULL);
object_property_set_bool(obj, false, "short-animation", NULL);
"Skip Xbox boot animation");
object_property_set_bool(obj, "short-animation", false, &error_fatal);
}