From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Wolfgang Bumiller <w.bumiller@proxmox.com>

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 <w.bumiller@proxmox.com>

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

---

 qemu-options.hx | 3 +++

 softmmu/vl.c    | 8 ++++++++

 2 files changed, 11 insertions(+)

diff --git a/qemu-options.hx b/qemu-options.hx

index 002ba697e9..a05959b9f1 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -1005,6 +1005,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 220c67cd32..d87cf6e103 100644

--- a/softmmu/vl.c

+++ b/softmmu/vl.c

@@ -2736,6 +2736,7 @@ void qemu_init(int argc, char **argv, char **envp)

     MachineClass *machine_class;

     bool userconfig = true;

     FILE *vmstate_dump_file = NULL;

+    long vm_id;

     qemu_add_opts(&qemu_drive_opts);

     qemu_add_drive_opts(&qemu_legacy_drive_opts);

@@ -3360,6 +3361,13 @@ void qemu_init(int argc, char **argv, char **envp)

             case QEMU_OPTION_smp:

                 machine_parse_property_opt(qemu_find_opts("smp-opts"), "smp", optarg, &error_fatal);

                 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);

                 break;