Two more fixes

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

Index: new/qapi-schema.json
===================================================================
--- new.orig/qapi-schema.json	2014-11-20 07:26:23.000000000 +0100
+++ new/qapi-schema.json	2014-11-20 07:26:39.000000000 +0100
@@ -2393,6 +2393,8 @@
 #
 # @default: #optional whether the machine is default
 #
+# @current: #optional whether this machine is currently used
+#
 # @cpu-max: maximum number of CPUs supported by the machine type
 #           (since 1.5.0)
 #
@@ -2400,7 +2402,7 @@
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool', 'cpu-max': 'int' } }
+            '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int' } }
 
 ##
 # @query-machines:
Index: new/vl.c
===================================================================
--- new.orig/vl.c	2014-11-20 06:50:55.000000000 +0100
+++ new/vl.c	2014-11-20 07:26:39.000000000 +0100
@@ -1534,6 +1534,11 @@
         info->name = g_strdup(mc->name);
         info->cpu_max = !mc->max_cpus ? 1 : mc->max_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;