]> git.proxmox.com Git - pve-qemu-kvm.git/blob - debian/patches/pve/0008-qapi-modify-query-machines.patch
adding 2.5 pve patches and left-over extra fixes
[pve-qemu-kvm.git] / debian / patches / pve / 0008-qapi-modify-query-machines.patch
1 From f3aa6523c91f0259f7168a8bbcf978b2e42168f7 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 14:31:18 +0100
4 Subject: [PATCH 08/41] qapi: modify query machines
5
6 provide '*is-current' in MachineInfo struct
7 ---
8 qapi-schema.json | 4 +++-
9 vl.c | 5 +++++
10 2 files changed, 8 insertions(+), 1 deletion(-)
11
12 diff --git a/qapi-schema.json b/qapi-schema.json
13 index 9f54ebf..3ac59c5 100644
14 --- a/qapi-schema.json
15 +++ b/qapi-schema.json
16 @@ -2790,6 +2790,8 @@
17 #
18 # @default: #optional whether the machine is default
19 #
20 +# @current: #optional whether this machine is currently used
21 +#
22 # @cpu-max: maximum number of CPUs supported by the machine type
23 # (since 1.5.0)
24 #
25 @@ -2797,7 +2799,7 @@
26 ##
27 { 'struct': 'MachineInfo',
28 'data': { 'name': 'str', '*alias': 'str',
29 - '*is-default': 'bool', 'cpu-max': 'int' } }
30 + '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int' } }
31
32 ##
33 # @query-machines:
34 diff --git a/vl.c b/vl.c
35 index 4211ff1..77c734e 100644
36 --- a/vl.c
37 +++ b/vl.c
38 @@ -1523,6 +1523,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
39 info->name = g_strdup(mc->name);
40 info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;
41
42 + if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
43 + info->has_is_current = true;
44 + info->is_current = true;
45 + }
46 +
47 entry = g_malloc0(sizeof(*entry));
48 entry->value = info;
49 entry->next = mach_list;
50 --
51 2.1.4
52