diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 14:08:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 14:08:04 +0000 |
| commit | 6fb0dae9efa90c2ef41d8aacef296b8959cf1d61 (patch) | |
| tree | f1c167782628fc1ccf5f9703e7363f682085f4c4 /hw/arm | |
| parent | b0b74e1f17508cb8cef8afd698558db1bd8999cc (diff) | |
| parent | fcd3f2cc124600385dba46c69a80626985c15b50 (diff) | |
| download | qemu-6fb0dae9efa90c2ef41d8aacef296b8959cf1d61.zip qemu-6fb0dae9efa90c2ef41d8aacef296b8959cf1d61.tar.gz qemu-6fb0dae9efa90c2ef41d8aacef296b8959cf1d61.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86 and machine queue, 2019-12-20
Bug fix:
* Resolve CPU models to v1 by default (Eduardo Habkost)
Cleanup:
* Remove incorrect numa_mem_supported checks (Igor Mammedov)
# gpg: Signature made Fri 20 Dec 2019 19:19:02 GMT
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-and-machine-pull-request:
numa: properly check if numa is supported
numa: remove not needed check
i386: Resolve CPU models to v1 by default
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/sbsa-ref.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 5853bde..9b5bcb5 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -789,7 +789,6 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->possible_cpu_arch_ids = sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id = sbsa_ref_get_default_cpu_node_id; - mc->numa_mem_supported = true; } static const TypeInfo sbsa_ref_info = { |