]>
Commit | Line | Data |
---|---|---|
53e83913 WB |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
83faa3fe TL |
3 | Date: Mon, 6 Apr 2020 12:16:48 +0200 |
4 | Subject: [PATCH] PVE: Add dummy -id command line parameter | |
53e83913 WB |
5 | |
6 | This used to be part of the qemu-side PVE authentication for | |
7 | VNC. Now this does nothing. | |
8 | ||
9 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
b855dce7 | 10 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> |
53e83913 WB |
11 | --- |
12 | qemu-options.hx | 3 +++ | |
83faa3fe | 13 | softmmu/vl.c | 8 ++++++++ |
53e83913 WB |
14 | 2 files changed, 11 insertions(+) |
15 | ||
16 | diff --git a/qemu-options.hx b/qemu-options.hx | |
d8474461 | 17 | index fdd551c2bb..4eb43b7bc5 100644 |
53e83913 WB |
18 | --- a/qemu-options.hx |
19 | +++ b/qemu-options.hx | |
d8474461 | 20 | @@ -1162,6 +1162,9 @@ legacy PC, they are not recommended for modern configurations. |
83faa3fe | 21 | |
5b15e2ec | 22 | ERST |
53e83913 WB |
23 | |
24 | +DEF("id", HAS_ARG, QEMU_OPTION_id, | |
25 | + "-id n set the VMID", QEMU_ARCH_ALL) | |
26 | + | |
27 | DEF("fda", HAS_ARG, QEMU_OPTION_fda, | |
28 | "-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL) | |
29 | DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL) | |
83faa3fe | 30 | diff --git a/softmmu/vl.c b/softmmu/vl.c |
bf251437 | 31 | index 0eabc71b68..323f6a23d4 100644 |
83faa3fe TL |
32 | --- a/softmmu/vl.c |
33 | +++ b/softmmu/vl.c | |
bf251437 | 34 | @@ -2648,6 +2648,7 @@ void qemu_init(int argc, char **argv) |
8dca018b SR |
35 | MachineClass *machine_class; |
36 | bool userconfig = true; | |
37 | FILE *vmstate_dump_file = NULL; | |
53e83913 | 38 | + long vm_id; |
8dca018b SR |
39 | |
40 | qemu_add_opts(&qemu_drive_opts); | |
41 | qemu_add_drive_opts(&qemu_legacy_drive_opts); | |
bf251437 | 42 | @@ -3271,6 +3272,13 @@ void qemu_init(int argc, char **argv) |
4567474e FE |
43 | machine_parse_property_opt(qemu_find_opts("smp-opts"), |
44 | "smp", optarg); | |
53e83913 WB |
45 | break; |
46 | + case QEMU_OPTION_id: | |
47 | + vm_id = strtol(optarg, (char **)&optarg, 10); | |
48 | + if (*optarg != 0 || vm_id < 100 || vm_id > INT_MAX) { | |
49 | + error_report("invalid -id argument %s", optarg); | |
50 | + exit(1); | |
51 | + } | |
52 | + break; | |
53 | case QEMU_OPTION_vnc: | |
8dca018b | 54 | vnc_parse(optarg); |
53e83913 | 55 | break; |