From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 6 Apr 2020 12:16:48 +0200 Subject: [PATCH] PVE: Add dummy -id command line parameter This used to be part of the qemu-side PVE authentication for VNC. Now this does nothing. Signed-off-by: Wolfgang Bumiller Signed-off-by: Thomas Lamprecht --- qemu-options.hx | 3 +++ softmmu/vl.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index c1352312c2..9a0cb6780e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -906,6 +906,9 @@ DEFHEADING() DEFHEADING(Block device options:) +DEF("id", HAS_ARG, QEMU_OPTION_id, + "-id n set the VMID", QEMU_ARCH_ALL) + DEF("fda", HAS_ARG, QEMU_OPTION_fda, "-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL) DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL) diff --git a/softmmu/vl.c b/softmmu/vl.c index 03152c816c..da204d24f0 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2866,6 +2866,7 @@ static char *find_datadir(void) void qemu_init(int argc, char **argv, char **envp) { int i; + long vm_id; int snapshot, linux_boot; const char *initrd_filename; const char *kernel_filename, *kernel_cmdline; @@ -3557,6 +3558,13 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; + case QEMU_OPTION_id: + vm_id = strtol(optarg, (char **)&optarg, 10); + if (*optarg != 0 || vm_id < 100 || vm_id > INT_MAX) { + error_report("invalid -id argument %s", optarg); + exit(1); + } + break; case QEMU_OPTION_vnc: vnc_parse(optarg, &error_fatal); break;