From 55124ec59ef647fd1b5a5eef3b3e8e34f4b344a0 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 18 Nov 2020 13:49:10 -0300 Subject: [PATCH] Don't fatal if a CPU family is missing during conversion (for configs accidentally migrated from dev to non-dev builds) --- src/config.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index f20e30c68..5ebb8afb5 100644 --- a/src/config.c +++ b/src/config.c @@ -558,10 +558,8 @@ load_machine(void) legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[legacy_mfg][i]; if (legacy_cpu >= legacy_table_entry->old_offset) { /* Found CPU entry. */ - if (!(legacy_family = cpu_get_family((char *) legacy_table_entry->family))) { - fatal("CPU family %s not found during legacy conversion\n", (char *) legacy_table_entry->family); - return; - } + if (!(legacy_family = cpu_get_family((char *) legacy_table_entry->family))) /* check if the family exists */ + break; config_set_string(cat, "cpu_family", (char *) legacy_family->internal_name); legacy_cpu -= legacy_table_entry->old_offset;