motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: introduce a new MlockState enum

Browse source 
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.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
Link: https://lore.kernel.org/r/20250212143920.1269754-4-d-tatianin@yandex-team.ru
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Daniil Tatianin 2025-02-12 17:39:19 +03:00 • committed by Peter Xu
parent cb74f2b8a6
commit cd2e472e54
5 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/virtio/virtio-mem.c
View file

@ -991,7 +991,7 @@ 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;
}

10
include/system/system.h
View file

@ -44,10 +44,18 @@ 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;

2
migration/postcopy-ram.c
View file

@ -651,7 +651,7 @@ 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));
/*

7
system/globals.c
View file

@ -31,10 +31,15 @@
#include "system/cpus.h"
#include "system/system.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;

9
system/vl.c
View file

@ -796,7 +796,7 @@ 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);
@ -1878,13 +1878,18 @@ 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);
}