diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 14:14:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 14:14:42 +0100 |
| commit | 2a8469aaabdc86c369bf4aeb77f87de7361f464b (patch) | |
| tree | d8ed3bc0abeb328d50bd303c6617f5a800ea8385 /util/oslib-posix.c | |
| parent | 475df9d809b1f3a7ebe8b15abd208216591f0143 (diff) | |
| parent | 11cde1c81093a33c46c7a4039bf750bb61551087 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 07 Jun 2017 19:06:51 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
configure: split c and cxx extra flags
coroutine-lock: do not touch coroutine after another one has been entered
.gdbinit: load QEMU sub-commands when gdb starts
coccinelle: fix typo in comment
oslib: strip trailing '\n' from error_setg() string argument
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/oslib-posix.c')
| -rw-r--r-- | util/oslib-posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 048d40d9de..5e8b4b39ed 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -402,7 +402,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, /* touch pages simultaneously */ if (touch_all_pages(area, hpagesize, numpages, smp_cpus)) { error_setg(errp, "os_mem_prealloc: Insufficient free host memory " - "pages available to allocate guest RAM\n"); + "pages available to allocate guest RAM"); } ret = sigaction(SIGBUS, &oldact, NULL); |