bump version to 2.11.1-1

[pve-qemu.git] / debian / patches / pve / 0007-qapi-modify-query-machines.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:31:18 +0100
Subject: [PATCH] qapi: modify query machines

provide '*is-current' in MachineInfo struct
---
 qapi-schema.json | 4 +++-
 vl.c             | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index ebc22fe5a6..8f436ba1f3 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1914,6 +1914,8 @@
 #
 # @is-default: whether the machine is default
 #
+# @is-current: whether this machine is currently used
+#
 # @cpu-max: maximum number of CPUs supported by the machine type
 #           (since 1.5.0)
 #
@@ -1923,7 +1925,7 @@
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool', 'cpu-max': 'int',
+            '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool'} }
 
 ##
diff --git a/vl.c b/vl.c
index 1ad1c04637..2e0fe15978 100644
--- a/vl.c
+++ b/vl.c
@@ -1604,6 +1604,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
         info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;
         info->hotpluggable_cpus = mc->has_hotpluggable_cpus;
 
+        if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
+            info->has_is_current = true;
+            info->is_current = true;
+        }
+
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;
         entry->next = mach_list;
-- 
2.11.0