AVR: fix selection and validation of CPU model.

Signed-off-by: Glenn Baker <[email protected]>

Author: glennsec

qemu/target/avr/cpu.c

@@ -368,6 +368,11 @@ static const AVRCPUInfo *avr_cpu_info_get(int cpu_model)
     return NULL;
 }
 
+int avr_cpu_model_valid(int cpu_model)
+{
+    return avr_cpu_info_get(cpu_model) != NULL;
+}
+
 #if 0
 static void avr_cpu_list_entry(gpointer data, gpointer user_data)
 {

qemu/target/avr/unicorn.h

@@ -23,4 +23,6 @@ void avr_reg_reset(struct uc_struct *uc);
 
 void avr_uc_init(struct uc_struct *uc);
 
+int avr_cpu_model_valid(int cpu_model);
+
 #endif /* UC_QEMU_TARGET_AVR_H */

uc.c

@@ -2714,6 +2714,11 @@ uc_err uc_ctl(uc_engine *uc, uc_control_type control, ...)
                     err = UC_ERR_ARG;
                     break;
                 }
+            } else if (uc->arch == UC_ARCH_AVR) {
+                if (!avr_cpu_model_valid(model)) {
+                    err = UC_ERR_ARG;
+                    break;
+                }
             } else {
                 err = UC_ERR_ARG;
                 break;