diff options
| author | Peter Maydell | 2017-10-10 14:25:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-10 14:25:46 +0200 |
| commit | 567d0a19c7998fa366598b83d5a6e5f0759d3ea9 (patch) | |
| tree | 7cac6341df37f80a05a7d71bdabe1ff3892c9994 /target/tricore/cpu.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | x86: Correct translation of some rdgsbase and wrgsbase encodings (diff) | |
| download | qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.tar.gz qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.tar.xz qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86 and machine queue, 2017-10-09
Includes x86, QOM, CPU, and option/config parsing patches.
Highlights:
* Deprecation of -nodefconfig option;
* MachineClass::valid_cpu_types field.
# gpg: Signature made Tue 10 Oct 2017 03:31:33 BST
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-and-machine-pull-request:
x86: Correct translation of some rdgsbase and wrgsbase encodings
vl: exit if maxcpus is negative
qom: update doc comment for type_register[_static]()
config: qemu_config_parse() return number of config groups
qemu-options: Deprecate -nodefconfig
vl: Eliminate defconfig variable
machine: Add a valid_cpu_types property
qom/cpu: move cpu_model null check to cpu_class_by_name()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/tricore/cpu.c')
| -rw-r--r-- | target/tricore/cpu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 5ab5b56454..871eb35453 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -120,10 +120,6 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; - if (!cpu_model) { - return NULL; - } - typename = g_strdup_printf("%s-" TYPE_TRICORE_CPU, cpu_model); oc = object_class_by_name(typename); g_free(typename); |