Purely cosmetic change to be consistent with the other names. Signed-off-by: Henning Schild <henning.schild(a)siemens.com&gt; --- Something i found in an old staging queue and that might be considered useful. src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 4 ++-- tests/qemuxml2argvtest.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f600ce9..d5b73e6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2655,7 +2655,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "vmport", QEMU_CAPS_MACHINE_VMPORT_OPT }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "drive", "detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES }, - { "realtime", "mlock", QEMU_CAPS_MLOCK }, + { "realtime", "mlock", QEMU_CAPS_REALTIME_MLOCK }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, { "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ca84f27..bd5c6d9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -254,7 +254,7 @@ typedef enum { QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */ - QEMU_CAPS_MLOCK, /* -realtime mlock=on|off */ + QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */ /* 150 */ QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4558b9f..3dc131b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7022,12 +7022,12 @@ qemuBuildMemCommandLine(virCommandPtr cmd, qemuBuildMemPathStr(cfg, def, qemuCaps, cmd) < 0) return -1; - if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_REALTIME_MLOCK)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("memory locking not supported by QEMU binary")); return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_REALTIME_MLOCK)) { virCommandAddArg(cmd, "-realtime"); virCommandAddArgFormat(cmd, "mlock=%s", def->mem.locked ? "on" : "off"); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 356f843..a5d51a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1750,9 +1750,9 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC); - DO_TEST("mlock-on", QEMU_CAPS_MLOCK); + DO_TEST("mlock-on", QEMU_CAPS_REALTIME_MLOCK); DO_TEST_FAILURE("mlock-on", NONE); - DO_TEST("mlock-off", QEMU_CAPS_MLOCK); + DO_TEST("mlock-off", QEMU_CAPS_REALTIME_MLOCK); DO_TEST("mlock-unsupported", NONE); DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid", -- 2.7.3