github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-24 06:29:19 +00:00
Code Issues Projects Releases Wiki Activity

dm: vtpm: disable Virtual TPM feature

Browse Source 
There is no requirement for Virual TPM feature on GP2.0 branch.

Tracked-On:#2553
Signed-off-by: Qi Yadong <yadong.qi@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Qi Yadong 2019-02-19 09:52:56 +08:00 committed by wenlingz
parent e40927ca35
commit 22df0249b5
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devicemodel/Makefile
View File

@ -83,9 +83,6 @@ SRCS += hw/platform/acpi/acpi.c
SRCS += hw/platform/acpi/acpi_pm.c SRCS += hw/platform/acpi/acpi_pm.c
SRCS += hw/platform/rpmb/rpmb_sim.c SRCS += hw/platform/rpmb/rpmb_sim.c
SRCS += hw/platform/rpmb/rpmb_backend.c SRCS += hw/platform/rpmb/rpmb_backend.c
SRCS += hw/platform/tpm/tpm_emulator.c
SRCS += hw/platform/tpm/tpm_crb.c
SRCS += hw/platform/tpm/tpm.c
SRCS += hw/platform/debugexit.c SRCS += hw/platform/debugexit.c
SRCS += hw/pci/wdt_i6300esb.c SRCS += hw/pci/wdt_i6300esb.c
SRCS += hw/pci/lpc.c SRCS += hw/pci/lpc.c

13
devicemodel/core/main.c
View File

@ -64,7 +64,6 @@
#include "atomic.h" #include "atomic.h"
#include "vmcfg_config.h" #include "vmcfg_config.h"
#include "vmcfg.h" #include "vmcfg.h"
#include "tpm.h"
#include "virtio.h" #include "virtio.h"
#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */ #define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
@ -163,7 +162,6 @@ usage(int code)
" --ptdev_no_reset: disable reset check for ptdev\n" " --ptdev_no_reset: disable reset check for ptdev\n"
" --debugexit: enable debug exit function\n" " --debugexit: enable debug exit function\n"
" --intr_monitor: enable interrupt storm monitor\n" " --intr_monitor: enable interrupt storm monitor\n"
" --vtpm2: Virtual TPM2 args: sock_path=$PATH_OF_SWTPM_SOCKET\n"
"............its params: threshold/s,probe-period(s),delay_time(ms),delay_duration(ms)\n", "............its params: threshold/s,probe-period(s),delay_time(ms),delay_duration(ms)\n",
progname, (int)strnlen(progname, PATH_MAX), "", (int)strnlen(progname, PATH_MAX), "", progname, (int)strnlen(progname, PATH_MAX), "", (int)strnlen(progname, PATH_MAX), "",
(int)strnlen(progname, PATH_MAX), ""); (int)strnlen(progname, PATH_MAX), "");
@ -471,8 +469,6 @@ vm_init_vdevs(struct vmctx *ctx)
if (ret < 0) if (ret < 0)
goto pci_fail; goto pci_fail;
init_vtpm2(ctx);
return 0; return 0;
pci_fail: pci_fail:
@ -507,7 +503,6 @@ vm_deinit_vdevs(struct vmctx *ctx)
atkbdc_deinit(ctx); atkbdc_deinit(ctx);
pci_irq_deinit(ctx); pci_irq_deinit(ctx);
ioapic_deinit(); ioapic_deinit();
deinit_vtpm2(ctx);
} }
static void static void
@ -694,7 +689,6 @@ enum {
CMD_OPT_VMCFG, CMD_OPT_VMCFG,
CMD_OPT_DUMP, CMD_OPT_DUMP,
CMD_OPT_INTR_MONITOR, CMD_OPT_INTR_MONITOR,
CMD_OPT_VTPM2,
}; };
static struct option long_options[] = { static struct option long_options[] = {
@ -732,7 +726,6 @@ static struct option long_options[] = {
CMD_OPT_PTDEV_NO_RESET}, CMD_OPT_PTDEV_NO_RESET},
{"debugexit", no_argument, 0, CMD_OPT_DEBUGEXIT}, {"debugexit", no_argument, 0, CMD_OPT_DEBUGEXIT},
{"intr_monitor", required_argument, 0, CMD_OPT_INTR_MONITOR}, {"intr_monitor", required_argument, 0, CMD_OPT_INTR_MONITOR},
{"vtpm2", required_argument, 0, CMD_OPT_VTPM2},
{0, 0, 0, 0 }, {0, 0, 0, 0 },
}; };
@ -876,12 +869,6 @@ dm_run(int argc, char *argv[])
case CMD_OPT_DEBUGEXIT: case CMD_OPT_DEBUGEXIT:
debugexit_enabled = true; debugexit_enabled = true;
break; break;
case CMD_OPT_VTPM2:
if (acrn_parse_vtpm2(optarg) != 0) {
errx(EX_USAGE, "invalid vtpm2 param %s", optarg);
exit(1);
}
break;
case CMD_OPT_INTR_MONITOR: case CMD_OPT_INTR_MONITOR:
if (acrn_parse_intr_monitor(optarg) != 0) { if (acrn_parse_intr_monitor(optarg) != 0) {
errx(EX_USAGE, "invalid intr-monitor params %s", optarg); errx(EX_USAGE, "invalid intr-monitor params %s", optarg);