提交 20d93402 编写于 作者: S Stefan Berger 提交者: Ján Tomko

qemu: Extend QEMU capabilities with 'tpm-spapr'

Extend the QEMU capabilties with tpm-spapr support.
Signed-off-by: NStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NJán Tomko <jtomko@redhat.com>
上级 914cb832
...@@ -558,6 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps, ...@@ -558,6 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"i8042", "i8042",
"rng-builtin", "rng-builtin",
"virtio-net.failover", "virtio-net.failover",
"tpm-spapr",
); );
...@@ -1274,6 +1275,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { ...@@ -1274,6 +1275,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU }, { "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU },
{ "i8042", QEMU_CAPS_DEVICE_I8042 }, { "i8042", QEMU_CAPS_DEVICE_I8042 },
{ "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN }, { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN },
{ "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
...@@ -3027,6 +3029,10 @@ const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] = { ...@@ -3027,6 +3029,10 @@ const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] = {
.type = VIR_DOMAIN_TPM_MODEL_CRB, .type = VIR_DOMAIN_TPM_MODEL_CRB,
.caps = QEMU_CAPS_DEVICE_TPM_CRB, .caps = QEMU_CAPS_DEVICE_TPM_CRB,
}, },
{
.type = VIR_DOMAIN_TPM_MODEL_SPAPR,
.caps = QEMU_CAPS_DEVICE_TPM_SPAPR,
},
}; };
static int static int
......
...@@ -540,6 +540,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ ...@@ -540,6 +540,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */ QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */
QEMU_CAPS_OBJECT_RNG_BUILTIN, /* -object rng-builtin */ QEMU_CAPS_OBJECT_RNG_BUILTIN, /* -object rng-builtin */
QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */ QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
QEMU_CAPS_DEVICE_TPM_SPAPR, /* -device tpm-spapr */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册