system/vl: extract overcommit option parsing into a helper

sysemu: introduce a new MlockState enum

hw/virtio/virtio-mem.c | 2 +-

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Reviewed-by: Peter Xu <peterx@redhat.com>

This will be extended in the future commits, let's move it out of line

right away so that it's easier to read.

Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>

---

system/vl.c | 21 ++++++++++++++-------

1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/system/vl.c b/system/vl.c

index XXXXXXX..XXXXXXX 100644

--- a/system/vl.c

+++ b/system/vl.c

@@ -XXX,XX +XXX,XX @@ static void object_option_parse(const char *str)

visit_free(v);

}

+static void overcommit_parse(const char *str)

+{

+ QemuOpts *opts;

+

+ opts = qemu_opts_parse_noisily(qemu_find_opts("overcommit"),

+ str, false);

+ if (!opts) {

+ exit(1);

+ }

+ enable_mlock = qemu_opt_get_bool(opts, "mem-lock", enable_mlock);

+ enable_cpu_pm = qemu_opt_get_bool(opts, "cpu-pm", enable_cpu_pm);

+}

+

/*

* Very early object creation, before the sandbox options have been activated.

*/

@@ -XXX,XX +XXX,XX @@ void qemu_init(int argc, char **argv)

object_option_parse(optarg);

break;

case QEMU_OPTION_overcommit:

- opts = qemu_opts_parse_noisily(qemu_find_opts("overcommit"),

- optarg, false);

- if (!opts) {

- exit(1);

- }

- enable_mlock = qemu_opt_get_bool(opts, "mem-lock", enable_mlock);

- enable_cpu_pm = qemu_opt_get_bool(opts, "cpu-pm", enable_cpu_pm);

+ overcommit_parse(optarg);

break;

case QEMU_OPTION_compat:

{

--

2.34.1

Replace the boolean value enable_mlock with an enum and add a helper to

decide whether we should be calling os_mlock.

This is a stepping stone towards introducing a new mlock mode, which

will be the third possible state of this enum.

Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>

---

hw/virtio/virtio-mem.c | 2 +-

include/sysemu/sysemu.h | 10 +++++++++-

migration/postcopy-ram.c | 2 +-

system/globals.c | 7 ++++++-

system/vl.c | 9 +++++++--

5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/virtio-mem.c

+++ b/hw/virtio/virtio-mem.c

@@ -XXX,XX +XXX,XX @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp)

return;

}

- if (enable_mlock) {

+ if (should_mlock(mlock_state)) {

error_setg(errp, "Incompatible with mlock");

return;

}

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/sysemu.h

+++ b/include/sysemu/sysemu.h

@@ -XXX,XX +XXX,XX @@ extern int display_opengl;

extern const char *keyboard_layout;

extern int old_param;

extern uint8_t *boot_splash_filedata;

-extern bool enable_mlock;

extern bool enable_cpu_pm;

extern QEMUClockType rtc_clock;

+typedef enum {

+ MLOCK_OFF = 0,

+ MLOCK_ON,

+} MlockState;

+

+bool should_mlock(MlockState);

+

+extern MlockState mlock_state;

+

#define MAX_OPTION_ROMS 16

typedef struct QEMUOptionRom {

const char *name;

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c

index XXXXXXX..XXXXXXX 100644

--- a/migration/postcopy-ram.c

+++ b/migration/postcopy-ram.c

@@ -XXX,XX +XXX,XX @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis)

mis->have_fault_thread = false;

}

- if (enable_mlock) {

+ if (should_mlock(mlock_state)) {

if (os_mlock(false) < 0) {

error_report("mlock: %s", strerror(errno));

/*

diff --git a/system/globals.c b/system/globals.c

index XXXXXXX..XXXXXXX 100644

--- a/system/globals.c

+++ b/system/globals.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/cpus.h"

#include "sysemu/sysemu.h"

+bool should_mlock(MlockState state)

+{

+ return state == MLOCK_ON;

+}

+

enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;

int display_opengl;

const char* keyboard_layout;

-bool enable_mlock;

+MlockState mlock_state;

bool enable_cpu_pm;

int autostart = 1;

int vga_interface_type = VGA_NONE;

diff --git a/system/vl.c b/system/vl.c

index XXXXXXX..XXXXXXX 100644

--- a/system/vl.c

+++ b/system/vl.c

@@ -XXX,XX +XXX,XX @@ static QemuOptsList qemu_run_with_opts = {

static void realtime_init(void)

{

- if (enable_mlock) {

+ if (should_mlock(mlock_state)) {

if (os_mlock(false) < 0) {

error_report("locking memory failed");

exit(1);

@@ -XXX,XX +XXX,XX @@ static void object_option_parse(const char *str)

static void overcommit_parse(const char *str)

{

QemuOpts *opts;

+ bool enable_mlock;

opts = qemu_opts_parse_noisily(qemu_find_opts("overcommit"),

str, false);

if (!opts) {

exit(1);

}

- enable_mlock = qemu_opt_get_bool(opts, "mem-lock", enable_mlock);

+

+ enable_mlock = qemu_opt_get_bool(opts, "mem-lock",

+ should_mlock(mlock_state));

+ mlock_state = enable_mlock ? MLOCK_ON : MLOCK_OFF;

+

enable_cpu_pm = qemu_opt_get_bool(opts, "cpu-pm", enable_cpu_pm);

}

--

2.34.1