[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/3] nvram: Add tpm-tis drive support
From: |
Corey Bryant |
Subject: |
[Qemu-devel] [PATCH v3 2/3] nvram: Add tpm-tis drive support |
Date: |
Thu, 6 Jun 2013 09:32:44 -0400 |
Add a drive property to the tpm-tis device and initialize the TPM
NVRAM if a drive is specified.
Signed-off-by: Corey Bryant <address@hidden>
---
v2
-No changes
v3
-No changes
---
hw/tpm/tpm_int.h | 2 ++
hw/tpm/tpm_tis.c | 8 ++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
index 2f582ca..05471ef 100644
--- a/hw/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -29,6 +29,8 @@ struct TPMState {
char *backend;
TPMBackend *be_driver;
+
+ BlockDriverState *bdrv;
};
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index d4d8152..8648b3b 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -27,6 +27,7 @@
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
#include "tpm_tis.h"
+#include "tpm_nvram.h"
#include "qemu-common.h"
/*#define DEBUG_TIS */
@@ -849,6 +850,7 @@ static Property tpm_tis_properties[] = {
DEFINE_PROP_UINT32("irq", TPMState,
s.tis.irq_num, TPM_TIS_IRQ),
DEFINE_PROP_STRING("tpmdev", TPMState, backend),
+ DEFINE_PROP_DRIVE("drive", TPMState, bdrv),
DEFINE_PROP_END_OF_LIST(),
};
@@ -864,6 +866,12 @@ static void tpm_tis_realizefn(DeviceState *dev, Error
**errp)
return;
}
+ if (s->bdrv && tpm_nvram_init(s->bdrv)) {
+ error_setg(errp, "tpm_tis: backend drive with id %s could not "
+ "initialize TPM NVRAM drive", s->backend);
+ return;
+ }
+
s->be_driver->fe_model = TPM_MODEL_TPM_TIS;
if (tpm_backend_init(s->be_driver, s, tpm_tis_receive_cb)) {
--
1.7.1
- [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Corey Bryant, 2013/06/06
- [Qemu-devel] [PATCH v3 2/3] nvram: Add tpm-tis drive support,
Corey Bryant <=
- [Qemu-devel] [PATCH v3 1/3] nvram: Add TPM NVRAM implementation, Corey Bryant, 2013/06/06
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Stefan Hajnoczi, 2013/06/07
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Anthony Liguori, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Corey Bryant, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Anthony Liguori, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Stefan Berger, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Corey Bryant, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Anthony Liguori, 2013/06/14
- Re: [Qemu-devel] [PATCH v3 0/3] TPM NVRAM persistent storage, Corey Bryant, 2013/06/14