diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-27 18:18:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-27 18:18:21 +0100 |
| commit | 21a21b853a1bb606358af61e738abfb9aecbd720 (patch) | |
| tree | 154ad3f9e601dff25552a9e68c666d6cce7a4706 /linux-user/qemu.h | |
| parent | 51313fe4f4afea65970a20b32ed2d35b44fbf993 (diff) | |
| parent | 03f28efbbb0ee521611e0eb28b45096b3598fb34 (diff) | |
| download | qemu-21a21b853a1bb606358af61e738abfb9aecbd720.zip qemu-21a21b853a1bb606358af61e738abfb9aecbd720.tar.gz qemu-21a21b853a1bb606358af61e738abfb9aecbd720.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
x86 and machine queue, 2016-07-27
Highlights:
* Fixes to allow CPU hotplug/unplug in any order;
* Exit QEMU on invalid global properties.
# gpg: Signature made Wed 27 Jul 2016 15:28:53 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-pull-request:
vl: exit if a bad property value is passed to -global
qdev: ignore GlobalProperty.errp for hotplugged devices
machine: Add comment to abort path in machine_set_kernel_irqchip
Revert "pc: Enforce adding CPUs contiguously and removing them in opposite order"
pc: Init CPUState->cpu_index with index in possible_cpus[]
qdev: Fix object reference leak in case device.realize() fails
exec: Set cpu_index only if it's not been explictly set
exec: Don't use cpu_index to detect if cpu_exec_init()'s been called
exec: Reduce CONFIG_USER_ONLY ifdeffenery
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index cdf23a7..bef465d 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -419,8 +419,6 @@ int target_msync(abi_ulong start, abi_ulong len, int flags); extern unsigned long last_brk; extern abi_ulong mmap_next_start; abi_ulong mmap_find_vma(abi_ulong, abi_ulong); -void cpu_list_lock(void); -void cpu_list_unlock(void); void mmap_fork_start(void); void mmap_fork_end(int child); |