Page MenuHomeFreeBSD
Files F108568397

D40454.diff
No OneTemporary
Actions

D40454.diff
View Options

diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c
--- a/usr.sbin/bhyve/tpm_device.c
+++ b/usr.sbin/bhyve/tpm_device.c
@@ -17,13 +17,18 @@
#include "acpi_device.h"
#include "config.h"
#include "tpm_device.h"
+#include "tpm_emul.h"
#define TPM_ACPI_DEVICE_NAME "TPM"
#define TPM_ACPI_HARDWARE_ID "MSFT0101"
+SET_DECLARE(tpm_emul_set, struct tpm_emul);
+
struct tpm_device {
struct vmctx *vm_ctx;
struct acpi_device *acpi_dev;
+ struct tpm_emul *emul;
+ void *emul_sc;
};
static const struct acpi_device_emul tpm_acpi_device_emul = {
@@ -37,6 +42,9 @@
if (dev == NULL)
return;
+ if (dev->emul != NULL && dev->emul->deinit != NULL)
+ dev->emul->deinit(dev->emul_sc);
+
acpi_device_destroy(dev->acpi_dev);
free(dev);
}
@@ -46,6 +54,7 @@
nvlist_t *const nvl)
{
struct tpm_device *dev = NULL;
+ struct tpm_emul **ppemul;
const char *value;
int error;
@@ -75,6 +84,26 @@
if (error)
goto err_out;
+ value = get_config_value_node(nvl, "type");
+ assert(value != NULL);
+ SET_FOREACH(ppemul, tpm_emul_set) {
+ if (strcmp(value, (*ppemul)->name))
+ continue;
+ dev->emul = *ppemul;
+ break;
+ }
+ if (dev->emul == NULL) {
+ warnx("TPM emulation \"%s\" not found", value);
+ error = EINVAL;
+ goto err_out;
+ }
+
+ if (dev->emul->init) {
+ error = dev->emul->init(&dev->emul_sc, nvl);
+ if (error)
+ goto err_out;
+ }
+
*new_dev = dev;
return (0);
diff --git a/usr.sbin/bhyve/tpm_emul.h b/usr.sbin/bhyve/tpm_emul.h
new file mode 100644
--- /dev/null
+++ b/usr.sbin/bhyve/tpm_emul.h
@@ -0,0 +1,22 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <corvink@FreeBSD.org>
+ */
+
+#pragma once
+
+#include <sys/linker_set.h>
+
+#include "config.h"
+
+struct tpm_device;
+
+struct tpm_emul {
+ const char *name;
+
+ int (*init)(void **sc, nvlist_t *nvl);
+ void (*deinit)(void *sc);
+};
+#define TPM_EMUL_SET(x) DATA_SET(tpm_emul_set, x)

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 10:58 AM (3 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16194654
Default Alt Text
D40454.diff (1 KB)

Event Timeline