5682929111
A few more bug fixes from upstream. Also stop using system membarriers, and revert a recent xen migration fix (not the right one). OBS-URL: https://build.opensuse.org/request/show/768144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=528
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
|
Date: Sun, 15 Jan 2012 19:53:49 +0100
|
|
Subject: Raise soft address space limit to hard limit
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
For SLES we want users to be able to use large memory configurations
|
|
with KVM without fiddling with ulimit -Sv.
|
|
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
[BR: add include for sys/resource.h]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
vl.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/vl.c b/vl.c
|
|
index bf0a6345d2394ad25adfe53c4006..68de8184f91c6ef3903859c70526 100644
|
|
--- a/vl.c
|
|
+++ b/vl.c
|
|
@@ -33,6 +33,7 @@
|
|
#include "qemu/uuid.h"
|
|
#include "sysemu/reset.h"
|
|
#include "sysemu/runstate.h"
|
|
+#include <sys/resource.h>
|
|
#include "sysemu/seccomp.h"
|
|
#include "sysemu/tcg.h"
|
|
|
|
@@ -2863,6 +2864,7 @@ int main(int argc, char **argv, char **envp)
|
|
char *dir, **dirs;
|
|
BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
|
|
QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list);
|
|
+ struct rlimit rlimit_as;
|
|
|
|
os_set_line_buffering();
|
|
|
|
@@ -2874,6 +2876,16 @@ int main(int argc, char **argv, char **envp)
|
|
|
|
qemu_mutex_lock_iothread();
|
|
|
|
+ /*
|
|
+ * Try to raise the soft address space limit.
|
|
+ * Default on SLES 11 SP2 is 80% of physical+swap memory.
|
|
+ */
|
|
+ getrlimit(RLIMIT_AS, &rlimit_as);
|
|
+ if (rlimit_as.rlim_cur < rlimit_as.rlim_max) {
|
|
+ rlimit_as.rlim_cur = rlimit_as.rlim_max;
|
|
+ setrlimit(RLIMIT_AS, &rlimit_as);
|
|
+ }
|
|
+
|
|
atexit(qemu_run_exit_notifiers);
|
|
qemu_init_exec_dir(argv[0]);
|
|
|