]>
Commit | Line | Data |
---|---|---|
ff60a765 DM |
1 | Index: new/qapi-schema.json |
2 | =================================================================== | |
24bb7da3 DM |
3 | --- new.orig/qapi-schema.json 2014-11-20 07:26:23.000000000 +0100 |
4 | +++ new/qapi-schema.json 2014-11-20 07:26:39.000000000 +0100 | |
5 | @@ -2393,6 +2393,8 @@ | |
ff60a765 DM |
6 | # |
7 | # @default: #optional whether the machine is default | |
8 | # | |
9 | +# @current: #optional whether this machine is currently used | |
10 | +# | |
667f3633 DM |
11 | # @cpu-max: maximum number of CPUs supported by the machine type |
12 | # (since 1.5.0) | |
13 | # | |
24bb7da3 | 14 | @@ -2400,7 +2402,7 @@ |
ff60a765 | 15 | ## |
432a6eb5 | 16 | { 'struct': 'MachineInfo', |
ff60a765 | 17 | 'data': { 'name': 'str', '*alias': 'str', |
667f3633 DM |
18 | - '*is-default': 'bool', 'cpu-max': 'int' } } |
19 | + '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int' } } | |
ff60a765 DM |
20 | |
21 | ## | |
22 | # @query-machines: | |
23 | Index: new/vl.c | |
24 | =================================================================== | |
24bb7da3 DM |
25 | --- new.orig/vl.c 2014-11-20 06:50:55.000000000 +0100 |
26 | +++ new/vl.c 2014-11-20 07:26:39.000000000 +0100 | |
27 | @@ -1534,6 +1534,11 @@ | |
fbe817e2 DM |
28 | info->name = g_strdup(mc->name); |
29 | info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus; | |
ff60a765 | 30 | |
fbe817e2 | 31 | + if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) { |
ff60a765 DM |
32 | + info->has_is_current = true; |
33 | + info->is_current = true; | |
34 | + } | |
35 | + | |
36 | entry = g_malloc0(sizeof(*entry)); | |
37 | entry->value = info; | |
38 | entry->next = mach_list; |