Skip to contentSkip to conversation

New cpu-max field in query-machines QMP command output

PATCH In review Michal Novotny 4 participants 10 messages Apr 8, 2013 – Apr 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 New cpu-max field in query-machines QMP command output

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
qapi-schema.json +3 -1
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type
+#
 # Since: 1.2.0
 ##
 { 'type': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool' } }
+            '*is-default': 'bool', 'cpu-max': 'int' } }
 
 ##
 # @query-machines:
vl.c +1 -0
index a8bba04..c05b3d3 100644
@@ -1617,6 +1617,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
         }
 
         info->name = g_strdup(m->name);
+        info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;
Signature · 1 line
1.7.11.7
#1 lore raw

PATCH v2 1/1 New cpu-max field in query-machines QMP command output

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
qapi-schema.json +3 -1
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type
+#
 # Since: 1.2.0
 ##
 { 'type': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool' } }
+            '*is-default': 'bool', 'cpu-max': 'int' } }
 
 ##
 # @query-machines:
vl.c +1 -0
index a8bba04..c05b3d3 100644
@@ -1617,6 +1617,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
         }
 
         info->name = g_strdup(m->name);
+        info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;
Signature · 1 line
1.7.11.7
Reviewed-by on v2 1/1
#2 lore raw
In reply to Michal Novotny
Quoted 15 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
qapi-schema.json +0 -0
index db542f6..689ca8d 100644

qapi-schema.json line 2864

Quoted 4 lines
qapi-schema.json +1 -0
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#3 lore raw
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 15 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

PS: I can add the '(since 1.5)' line myself.

Quoted 3 lines
#4 lore raw
Quoted 28 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 14 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Not really, the query-cpu-max shows maximum number of CPUs supported per currently running machine (machine type) however the extension to query-machines shows the maximum number of CPUs supported per each of the displayed machine types. This usually doesn't matter on x86 architectures however it does matter on ARM, for example, as ARM has some CPU models supporting up to 4 CPUs (highbank model) whereas most of the ARM processors does have only one CPU.

Michal

Quoted 5 lines

PS: I can add the '(since 1.5)' line myself.

Quoted 2 lines
Signature · 2 lines
Michal Novotny <[email protected]>, RHCE, Red Hat
Virtualization | libvirt-php bindings | php-virt-control.org
#5 lore raw
Quoted 36 lines · On Tue, 09 Apr 2013 15:09:21 +0200 Michal Novotny <[email protected]> wrote:
Quoted 28 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 14 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Quoted 7 lines

Not really, the query-cpu-max shows maximum number of CPUs supported per currently running machine (machine type) however the extension to query-machines shows the maximum number of CPUs supported per each of the displayed machine types. This usually doesn't matter on x86 architectures however it does matter on ARM, for example, as ARM has some CPU models supporting up to 4 CPUs (highbank model) whereas most of the ARM processors does have only one CPU.

Can't we eliminate the query-cpu-max command if we extend the query-machines command to show which machine type is in use?

#6 lore raw
Quoted 44 lines · Luiz Capitulino
Quoted 34 lines · On Tue, 09 Apr 2013 15:09:21 +0200 Michal Novotny <[email protected]> wrote:
Quoted 28 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 14 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Quoted 7 lines

Not really, the query-cpu-max shows maximum number of CPUs supported per currently running machine (machine type) however the extension to query-machines shows the maximum number of CPUs supported per each of the displayed machine types. This usually doesn't matter on x86 architectures however it does matter on ARM, for example, as ARM has some CPU models supporting up to 4 CPUs (highbank model) whereas most of the ARM processors does have only one CPU.

Quoted 2 lines

Can't we eliminate the query-cpu-max command if we extend the query-machines command to show which machine type is in use?

It may be useful as query-cpu-max is showing maximum number of CPUs supported per machine type QEMU currently emulates. We don't have to know the machine type and look for this number manually in the query-machines output if we have query-cpu-max. We would have to both know the machine type and look for the number manually to get max-cpu count for currently running machine if we get rid of query-cpu-max command.

Whether something will use the value of CPU-max for currently running machine (query-cpu-max output) is another question.

Michal

Signature · 2 lines
Michal Novotny <[email protected]>, RHCE, Red Hat
Virtualization | libvirt-php bindings | php-virt-control.org
#7 lore raw
Quoted 46 lines · On Tue, 09 Apr 2013 15:32:57 +0200 Michal Novotny <[email protected]> wrote:
Quoted 44 lines · Luiz Capitulino
Quoted 41 lines · On Tue, 09 Apr 2013 15:09:21 +0200 Michal Novotny <[email protected]> wrote:
Quoted 28 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 14 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Not really, the query-cpu-max shows maximum number of CPUs supported per currently running machine (machine type) however the extension to query-machines shows the maximum number of CPUs supported per each of the displayed machine types. This usually doesn't matter on x86 architectures however it does matter on ARM, for example, as ARM has some CPU models supporting up to 4 CPUs (highbank model) whereas most of the ARM processors does have only one CPU.

Quoted 7 lines
Quoted 2 lines

Can't we eliminate the query-cpu-max command if we extend the query-machines command to show which machine type is in use?

It may be useful as query-cpu-max is showing maximum number of CPUs supported per machine type QEMU currently emulates. We don't have to know the machine type and look for this number manually in the query-machines output if we have query-cpu-max.

QMP is a machine protocol, "manual" in that context is not a problem. It's actually wanted.

Quoted 6 lines

We would have to both
know the machine type and look for the number manually to get max-cpu count for currently running machine if we get rid of query-cpu-max command.

Whether something will use the value of CPU-max for currently running machine (query-cpu-max output) is another question.

What you mean by that? Why are we adding a command if we don't even know if it's going to be used?

If I remember correctly, it was said that libivrt was asking for this command. If this is not the case let's drop it, because the command is bad (ie. this should be done through QOM).

I've applied this patch, but again, if query-cpu-max is not required by any QMP user, please post patches reverting it.

#8 lore raw
Quoted 48 lines · Luiz Capitulino
Quoted 45 lines · On Tue, 09 Apr 2013 15:32:57 +0200 Michal Novotny <[email protected]> wrote:
Quoted 44 lines · Luiz Capitulino
Quoted 41 lines · On Tue, 09 Apr 2013 15:09:21 +0200 Michal Novotny <[email protected]> wrote:
Quoted 28 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
 qapi-schema.json | 4 +++-
 vl.c             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 14 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Not really, the query-cpu-max shows maximum number of CPUs supported per currently running machine (machine type) however the extension to query-machines shows the maximum number of CPUs supported per each of the displayed machine types. This usually doesn't matter on x86 architectures however it does matter on ARM, for example, as ARM has some CPU models supporting up to 4 CPUs (highbank model) whereas most of the ARM processors does have only one CPU.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Can't we eliminate the query-cpu-max command if we extend the query-machines command to show which machine type is in use?

It may be useful as query-cpu-max is showing maximum number of CPUs supported per machine type QEMU currently emulates. We don't have to know the machine type and look for this number manually in the query-machines output if we have query-cpu-max.

QMP is a machine protocol, "manual" in that context is not a problem. It's actually wanted.

By manually in this context I mean if you have already running machine and you know the machine type then you have to run query-machines and look for your CPU type if you want know maximum number of CPUs supported by this machine type.

Quoted 9 lines
Quoted 7 lines

We would have to both
know the machine type and look for the number manually to get max-cpu count for currently running machine if we get rid of query-cpu-max command.

Whether something will use the value of CPU-max for currently running machine (query-cpu-max output) is another question.

What you mean by that? Why are we adding a command if we don't even know if it's going to be used?

The original reason was to allow libvirt to know max. number of CPUs however libvirt queries the machines and puts the aliases and CPU models into capabilities which is basically reason why we could drop query-cpu-max command as new implementation was necessary (the one extending MachineInfo by cpu-max).

Quoted 4 lines

If I remember correctly, it was said that libivrt was asking for this command. If this is not the case let's drop it, because the command is bad (ie. this should be done through QOM).

Originally yes however the implementation of extending MachineInfo seems to be better for them so they don't need query-cpu-max anymore.

Quoted 3 lines

I've applied this patch, but again, if query-cpu-max is not required by any QMP user, please post patches reverting it.

Ok, I will create a revert patch and I'll send it.

Michal

Signature · 2 lines
Michal Novotny <[email protected]>, RHCE, Red Hat
Virtualization | libvirt-php bindings | php-virt-control.org
#9 lore raw
In reply to Luiz Capitulino
Quoted 30 lines · Luiz Capitulino
Quoted 11 lines · On Mon, 08 Apr 2013 11:14:32 -0600 Eric Blake <[email protected]> wrote:
Quoted 10 lines · Michal Novotny

Alter the query-machines QMP command to output information about maximum number of CPUs for each machine type with default value set to 1 in case the number of max_cpus is not set.

---
  qapi-schema.json | 4 +++-
  vl.c             | 1 +
  2 files changed, 4 insertions(+), 1 deletion(-)
Quoted 15 lines

qapi-schema.json line 2864

Quoted 9 lines
qapi-schema.json +1 -0
index db542f6..689ca8d 100644
@@ -2861,11 +2861,13 @@
  #
  # @default: #optional whether the machine is default
  #
+# @cpu-max: maximum number of CPUs supported by the machine type

Typically, when adding a field in a later version than the original introduction of the datatype, we add '(since 1.5)' to make it obvious when to expect the field. However, as nothing (currently) enforces this rule, I think such an addition is minor enough that it wouldn't invalidate the use of my:

Quoted 5 lines

Oh, it turns out I was making some confusion with this patch and didn't realize it was extending the query-machines command.

I don't mean there's anything wrong with it, but my question is: doesn't this patch invalidates query-cpu-max?

Unfortunately, for libvirt query-cpu-max isn't really usable as it needs us to start qemu with the correct machine type. This would increase overhead as we would need to start the qemu process with a safe number of cpus, use query-cpu-max and then restart the process.

The information added in the query-machines output can on the other hand be cached (we are already doing this for the machine types) and used later from the cache without increasing overhead.

So yes, I think it invalidates query-cpu-max and it can be removed in case it wasn't released.

Peter

Quoted 8 lines

PS: I can add the '(since 1.5)' line myself.

Quoted 3 lines