Stop setting 'alias' in the MachineClass and instead set 'aliases' in the AliasedClass.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/avr/arduino.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c index e166ca18e11..fbcdc32a21f 100644 --- a/hw/avr/arduino.c +++ b/hw/avr/arduino.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "atmega.h" #include "boot.h" -#include "qom/object.h" +#include "qom/object_interfaces.h" struct ArduinoMachineState { /*< private >*/ @@ -73,13 +73,18 @@ static void arduino_duemilanove_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(mc); + static const char *const aliases[] = { + MACHINE_TYPE_NAME("2009"), NULL, + }; + + alc->aliases = aliases; /* * https://www.arduino.cc/en/Main/ArduinoBoardDuemilanove * https://www.arduino.cc/en/uploads/Main/arduino-duemilanove-schematic.pdf */ mc->desc = "Arduino Duemilanove (ATmega168)", - mc->alias = "2009"; amc->mcu_type = TYPE_ATMEGA168_MCU; amc->xtal_hz = 16 * 1000 * 1000; }; @@ -88,13 +93,18 @@ static void arduino_uno_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(mc); + static const char *const aliases[] = { + MACHINE_TYPE_NAME("uno"), NULL, + }; + + alc->aliases = aliases; /* * https://store.arduino.cc/arduino-uno-rev3 * https://www.arduino.cc/en/uploads/Main/arduino-uno-schematic.pdf */ mc->desc = "Arduino UNO (ATmega328P)"; - mc->alias = "uno"; amc->mcu_type = TYPE_ATMEGA328_MCU; amc->xtal_hz = 16 * 1000 * 1000; }; @@ -103,13 +113,18 @@ static void arduino_mega_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(mc); + static const char *const aliases[] = { + MACHINE_TYPE_NAME("mega"), NULL, + }; + + alc->aliases = aliases; /* * https://www.arduino.cc/en/Main/ArduinoBoardMega * https://www.arduino.cc/en/uploads/Main/arduino-mega2560-schematic.pdf */ mc->desc = "Arduino Mega (ATmega1280)"; - mc->alias = "mega"; amc->mcu_type = TYPE_ATMEGA1280_MCU; amc->xtal_hz = 16 * 1000 * 1000; }; @@ -118,13 +133,18 @@ static void arduino_mega2560_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(mc); + static const char *const aliases[] = { + MACHINE_TYPE_NAME("mega2560"), NULL, + }; + + alc->aliases = aliases; /* * https://store.arduino.cc/arduino-mega-2560-rev3 * https://www.arduino.cc/en/uploads/Main/arduino-mega2560_R3-sch.pdf */ mc->desc = "Arduino Mega 2560 (ATmega2560)"; - mc->alias = "mega2560"; amc->mcu_type = TYPE_ATMEGA2560_MCU; amc->xtal_hz = 16 * 1000 * 1000; /* CSTCE16M0V53-R0 */ }; -- 2.56.1
