path: root/util
diff options
authorPeter Maydell <>2015-11-05 14:31:24 +0000
committerPeter Maydell <>2015-11-05 14:31:24 +0000
commit496c1b19facc7b850fa0c09899fcc07a0702fbfd (patch)
tree123bc6e3e5fb4ab3c8c0d5ba900ff3b2da4a0e57 /util
parent8835b9df3bddf332c883c861d6a1defc12c4ebe9 (diff)
parente01dd3da5cf9aa90ae844d3b86c2c2762066edac (diff)
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Guest ABI fixes for PC machines (hw_version) * Fixes for recent Perl * John Snow's configure fixes * file-backed RAM improvements (Igor, Pavel) * -Werror=clobbered fixes (Stefan) * Kill -d ioport * Fix qemu-system-s390x * Performance improvement for kvmclock migration # gpg: Signature made Thu 05 Nov 2015 13:42:27 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <>" # gpg: aka "Paolo Bonzini <>" * remotes/bonzini/tags/for-upstream: iscsi: Translate scsi sense into error code Revert "Introduce cpu_clean_all_dirty" kvmclock: add a new function to update env->tsc. configure: disable FORTIFY_SOURCE under clang backends/hostmem-file: Allow to specify full pathname for backing file configure: disallow ccache during compile tests cpu-exec: Fix compiler warning (-Werror=clobbered) memory: call begin, log_start and commit when registering a new listener megasas: Use qemu_hw_version() instead of QEMU_VERSION osdep: Rename qemu_{get, set}_version() to qemu_{, set_}hw_version() pc: Set hw_version on all machine classes qemu-log: remove -d ioport ioport: do not use CPU_LOG_IOPORT target-i386: fix pcmpxstrx equal-ordered (strstr) mode scripts/ Escape left brace file_ram_alloc: propagate error to caller instead of terminating QEMU Signed-off-by: Peter Maydell <>
Diffstat (limited to 'util')
1 files changed, 5 insertions, 5 deletions
diff --git a/util/osdep.c b/util/osdep.c
index 0092bb6..80c6bfe 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -52,7 +52,7 @@ extern int madvise(caddr_t, size_t, int);
static bool fips_enabled = false;
-static const char *qemu_version = QEMU_VERSION;
+static const char *hw_version = QEMU_VERSION;
int socket_set_cork(int fd, int v)
@@ -311,14 +311,14 @@ int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
return ret;
-void qemu_set_version(const char *version)
+void qemu_set_hw_version(const char *version)
- qemu_version = version;
+ hw_version = version;
-const char *qemu_get_version(void)
+const char *qemu_hw_version(void)
- return qemu_version;
+ return hw_version;
void fips_set_state(bool requested)
OpenPOWER on IntegriCloud