shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

qemu_capabilities: Introduce QEMU_CAPS_MACHINE_SHIM

Browse Source 
In its commit v9.2.0-323-ga5bd044b15 QEMU introduced another
command line option: -shim. It's used to load kernel. Track
presence of it via QEMU_CAPS_MACHINE_SHIM.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2025-03-05 13:40:04 +01:00
parent 6b63334233
commit 30be3b0d9d
5 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -728,6 +728,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"machine.virt.aia", /* QEMU_CAPS_MACHINE_VIRT_AIA */
"virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
"blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
"shim", /* QEMU_CAPS_MACHINE_SHIM */
);
@ -1774,6 +1775,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] = {
static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] = {
{ "confidential-guest-support", QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT },
{ "shim", QEMU_CAPS_MACHINE_SHIM },
};
static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGenericPC[] = {

1
src/qemu/qemu_capabilities.h
View File

@ -707,6 +707,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_MACHINE_VIRT_AIA, /* -machine virt,aia=(none|aplic|aplic-imsic), RISC-V only */
QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
QEMU_CAPS_MACHINE_SHIM, /* -shim command line argument */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;

1
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
View File

@ -142,6 +142,7 @@
<flag name='query-cpu-model-expansion.deprecated-props'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='virtio-mem-ccw'/>
<flag name='shim'/>
<version>9002050</version>
<microcodeVersion>39100285</microcodeVersion>
<package>v9.2.0-1203-gd6430c17d7</package>

1
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
View File

@ -213,6 +213,7 @@
<flag name='netdev-stream-reconnect-miliseconds'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='blockdev-set-active'/>
<flag name='shim'/>
<version>9002050</version>
<microcodeVersion>43100285</microcodeVersion>
<package>v9.2.0-2369-g98c7362b1e</package>

1
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
View File

@ -212,6 +212,7 @@
<flag name='netdev-stream-reconnect-miliseconds'/>
<flag name='migrate-incoming.exit-on-error'/>
<flag name='blockdev-set-active'/>
<flag name='shim'/>
<version>9002050</version>
<microcodeVersion>43100285</microcodeVersion>
<package>v9.2.0-2369-g98c7362b1e</package>