diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:50:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-26 16:50:59 +0000 |
| commit | 72f75c76d84e2eefc6806dafca116860ffe847f0 (patch) | |
| tree | bc260d28464570f882bbef7249ec5154f0ae628e /include | |
| parent | a5df35070a4c7fa8e2d9c6bd7175ee8e3e0f7641 (diff) | |
| parent | d08e42a1125d384cb53423f5810b0c7ea52dc6c9 (diff) | |
| download | qemu-72f75c76d84e2eefc6806dafca116860ffe847f0.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
vhost, pc: fixes for 2.5
Minor vhost fixes. HW version tweak for PC.
Documentation and test updates.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 26 Nov 2015 16:40:25 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
vhost-user-test: fix migration overlap test
Fix memory leak on error
Revert "vhost: send SET_VRING_ENABLE at start/stop"
tests/vhost-user-bridge: read command line arguments
tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
vhost-user: clarify start and enable
vhost-user: set link down when the char device is closed
pc: Don't set hw_version on pc-*-2.5
osdep: Change default value of qemu_hw_version() to "2.5+"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 5 | ||||
| -rw-r--r-- | include/qemu/osdep.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 24eb6f0e77..5da4fb00ee 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -51,6 +51,11 @@ bool machine_mem_merge(MachineState *machine); * used to provide @cpu_index to socket number mapping, allowing * a machine to group CPU threads belonging to the same socket/package * Returns: socket number given cpu_index belongs to. + * @hw_version: + * Value of QEMU_VERSION when the machine was added to QEMU. + * Set only by old machines because they need to keep + * compatibility on code that exposed QEMU_VERSION to guests in + * the past (and now use qemu_hw_version()). */ struct MachineClass { /*< private >*/ diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 861d84b4e4..84e84ac700 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -256,6 +256,10 @@ static inline void qemu_timersub(const struct timeval *val1, void qemu_set_cloexec(int fd); +/* QEMU "hardware version" setting. Used to replace code that exposed + * QEMU_VERSION to guests in the past and need to keep compatibilty. + * Do not use qemu_hw_version() in new code. + */ void qemu_set_hw_version(const char *); const char *qemu_hw_version(void); |