Merge "Adding qemu as a submodule of KVMFORNFV"

1 files changed, 0 insertions, 45 deletions

diff --git a/qemu/include/sysemu/tpm.h b/qemu/include/sysemu/tpm.h
deleted file mode 100644
index c8afa179e..000000000
--- a/qemu/include/sysemu/tpm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Public TPM functions
- *
- * Copyright (C) 2011-2013 IBM Corporation
- *
- * Authors:
- *  Stefan Berger    <stefanb@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-#ifndef QEMU_TPM_H
-#define QEMU_TPM_H
-
-#include "qemu/option.h"
-
-typedef struct TPMState TPMState;
-
-int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
-int tpm_init(void);
-void tpm_cleanup(void);
-
-typedef enum  TPMVersion {
-    TPM_VERSION_UNSPEC = 0,
-    TPM_VERSION_1_2 = 1,
-    TPM_VERSION_2_0 = 2,
-} TPMVersion;
-
-TPMVersion tpm_tis_get_tpm_version(Object *obj);
-
-#define TYPE_TPM_TIS                "tpm-tis"
-
-static inline TPMVersion tpm_get_version(void)
-{
-#ifdef CONFIG_TPM
-    Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
-
-    if (obj) {
-        return tpm_tis_get_tpm_version(obj);
-    }
-#endif
-    return TPM_VERSION_UNSPEC;
-}
-
-#endif /* QEMU_TPM_H */