update submodule and patches to QEMU 8.2.2

[pve-qemu.git] / debian / patches / pve / 0025-PVE-Allow-version-code-in-machine-type.patch

diff --git a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
index 507a5e353faab74deaaa27d948d7c2d8d306b0c5..5a5586a8e9fe28f72455a534de5cdd4fd51d7eb8 100644 (file)
--- a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
+++ b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
@@ -17,7 +17,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
  hw/core/machine-qmp-cmds.c |  5 +++++
  include/hw/boards.h        |  2 ++
  qapi/machine.json          |  4 +++-
- softmmu/vl.c               | 25 +++++++++++++++++++++++++
+ system/vl.c                | 25 +++++++++++++++++++++++++
  4 files changed, 35 insertions(+), 1 deletion(-)
 
 diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
@@ -37,10 +37,10 @@ index 40821e2317..ee93ddd69a 100644
  
          if (mc->default_cpu_type) {
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index ed83360198..f8b88cd86a 100644
+index da85f86efb..1aa0987020 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -235,6 +235,8 @@ struct MachineClass {
+@@ -240,6 +240,8 @@ struct MachineClass {
      const char *desc;
      const char *deprecation_reason;
  
@@ -50,10 +50,10 @@ index ed83360198..f8b88cd86a 100644
      void (*reset)(MachineState *state, ShutdownCause reason);
      void (*wakeup)(MachineState *state);
 diff --git a/qapi/machine.json b/qapi/machine.json
-index fbb61f18e4..7da3c519ba 100644
+index 297ad0e0e5..a9fd40d844 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -161,6 +161,8 @@
+@@ -168,6 +168,8 @@
  #
  # @acpi: machine type supports ACPI (since 8.0)
  #
@@ -62,7 +62,7 @@ index fbb61f18e4..7da3c519ba 100644
  # Since: 1.2
  ##
  { 'struct': 'MachineInfo',
-@@ -168,7 +170,7 @@
+@@ -175,7 +177,7 @@
              '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
              'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
              'deprecated': 'bool', '*default-cpu-type': 'str',
@@ -71,19 +71,19 @@ index fbb61f18e4..7da3c519ba 100644
  
  ##
  # @query-machines:
-diff --git a/softmmu/vl.c b/softmmu/vl.c
-index 3ee90b3b94..4b6d0b82fd 100644
---- a/softmmu/vl.c
-+++ b/softmmu/vl.c
-@@ -1597,6 +1597,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
+diff --git a/system/vl.c b/system/vl.c
+index 56d715c818..87f03e61a1 100644
+--- a/system/vl.c
++++ b/system/vl.c
+@@ -1660,6 +1660,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
  static MachineClass *select_machine(QDict *qdict, Error **errp)
  {
-     const char *optarg = qdict_get_try_str(qdict, "type");
+     const char *machine_type = qdict_get_try_str(qdict, "type");
 +    const char *pvever = qdict_get_try_str(qdict, "pvever");
      GSList *machines = object_class_get_list(TYPE_MACHINE, false);
      MachineClass *machine_class;
      Error *local_err = NULL;
-@@ -1614,6 +1615,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
+@@ -1677,6 +1678,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
          }
      }
  
@@ -95,7 +95,7 @@ index 3ee90b3b94..4b6d0b82fd 100644
      g_slist_free(machines);
      if (local_err) {
          error_append_hint(&local_err, "Use -machine help to list supported machines\n");
-@@ -3250,12 +3256,31 @@ void qemu_init(int argc, char **argv)
+@@ -3319,12 +3325,31 @@ void qemu_init(int argc, char **argv)
              case QEMU_OPTION_machine:
                  {
                      bool help;