]> xenbits.xensource.com Git - libvirt.git/commit
qemu-capabilities: Fix query-cpu-model-expansion on s390 with older kernel
authorCollin L. Walling <walling@linux.vnet.ibm.com>
Thu, 12 Jan 2017 16:18:11 +0000 (11:18 -0500)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 13 Jan 2017 15:55:58 +0000 (16:55 +0100)
commite8a43f1995acc805e8710f61fb81337bf79ef686
tree6bef60b0d26f2bfcae4aa6008d71d0085cddd9f5
parent93a062c3b293685024d60e841a37e93e303f4943
qemu-capabilities: Fix query-cpu-model-expansion on s390 with older kernel

When running on s390 with a kernel that does not support cpu model checking and
with a Qemu new enough to support query-cpu-model-expansion, the gathering of qemu
capabilities will fail. Qemu responds to the query-cpu-model-expansion qmp
command with an error because the needed kernel ioct does not exist. When this
happens a guest cannot even be defined due to missing qemu capabilities data.

This patch fixes the problem by silently ignoring generic errors stemming from
calls to query-cpu-model-expansion.

Reported-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
src/qemu/qemu_monitor_json.c