qemu: Respect the JSON schema for hot plug #11667
Conversation
|
@c3d Could you sign off your commit message to pass this check? 🙂 https://github.com/kata-containers/kata-containers/actions/runs/16783299706/job/47527438036?pr=11667 |
Ooops. I normally have auto-signoff set, but I was working from an unusual environment (I'm currently moving). Fixed, thanks for reporting. |
When hot-plugging CPUs on QEMU, we send a QMP command with JSON arguments. QEMU 9.2 recently became more strict[1] enforcing the JSON schema for QMP parameters. As a result, running Kata Containers with QEMU 9.2 results in a message complaining that the core-id parameter is expected to be an integer: ``` qmp hotplug cpu, cpuID=cpu-0 socketID=1, error: QMP command failed: Invalid parameter type for 'core-id', expected: integer ``` Fix that by changing the core-id, socket-id and thread-id to be integer values. [1]: qemu/qemu@be93fd5 Fixes: kata-containers#11633 Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
| args := map[string]interface{}{ | ||
| "driver": driver, | ||
| "id": cpuID, | ||
| "core-id": coreID, | ||
| } | ||
|
|
||
| if socketID != "" && isSocketIDSupported(driver) { | ||
| if socketID >= 0 && isSocketIDSupported(driver) { |
There was a problem hiding this comment.
We could arguably error out if socketID < 0 instead of considering any negative value to mean "not set" but this shouldn't delay this fix.
There was a problem hiding this comment.
Oh I now see that -1 is used as a default value for some platforms. Let's keep the code simple then. Please forget my previous comment.
When hot-plugging CPUs on QEMU, we send a QMP command with JSON arguments. QEMU 9.2 recently became more strict1 enforcing the JSON schema for QMP parameters. As a result, running Kata Containers with QEMU 9.2 results in a message complaining that the core-id parameter is expected to be an integer:
Fix that by changing the core-id, socket-id and thread-id to be integer values.
Fixes: #11633