[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [mini-os master] Eliminate tpmfront union member in struct file
commit 4673f9aace27c21cc07030a07ed443affeee4f06 Author: Juergen Gross <jgross@xxxxxxxx> AuthorDate: Tue Jan 11 15:58:11 2022 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Wed Jan 12 11:35:55 2022 +0000 Eliminate tpmfront union member in struct file Replace the tpmfront specific union member in struct file with the common dev pointer. Signed-off-by: Juergen Gross <jgross@xxxxxxxx> Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> --- include/lib.h | 5 ----- lib/sys.c | 2 +- tpmfront.c | 8 ++++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/include/lib.h b/include/lib.h index d740065..2ddc076 100644 --- a/include/lib.h +++ b/include/lib.h @@ -193,11 +193,6 @@ struct file { struct evtchn_port_list ports; } evtchn; struct gntmap gntmap; -#ifdef CONFIG_TPMFRONT - struct { - struct tpmfront_dev *dev; - } tpmfront; -#endif #ifdef CONFIG_TPM_TIS struct { struct tpm_chip *dev; diff --git a/lib/sys.c b/lib/sys.c index b35e433..b042bf5 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -462,7 +462,7 @@ int close(int fd) #endif #ifdef CONFIG_TPMFRONT case FTYPE_TPMFRONT: - shutdown_tpmfront(files[fd].tpmfront.dev); + shutdown_tpmfront(files[fd].dev); files[fd].type = FTYPE_NONE; return 0; #endif diff --git a/tpmfront.c b/tpmfront.c index be671c2..0a2fefc 100644 --- a/tpmfront.c +++ b/tpmfront.c @@ -538,7 +538,7 @@ int tpmfront_open(struct tpmfront_dev* dev) dev->fd = alloc_fd(FTYPE_TPMFRONT); printk("tpmfront_open(%s) -> %d\n", dev->nodename, dev->fd); - files[dev->fd].tpmfront.dev = dev; + files[dev->fd].dev = dev; dev->respgot = false; return dev->fd; } @@ -547,7 +547,7 @@ int tpmfront_posix_write(int fd, const uint8_t* buf, size_t count) { int rc; struct tpmfront_dev* dev; - dev = files[fd].tpmfront.dev; + dev = files[fd].dev; if(count == 0) { return 0; @@ -573,7 +573,7 @@ int tpmfront_posix_read(int fd, uint8_t* buf, size_t count) size_t dummysz; struct tpmfront_dev* dev; - dev = files[fd].tpmfront.dev; + dev = files[fd].dev; if(count == 0) { return 0; @@ -606,7 +606,7 @@ int tpmfront_posix_fstat(int fd, struct stat* buf) uint8_t* dummybuf; size_t dummysz; int rc; - struct tpmfront_dev* dev = files[fd].tpmfront.dev; + struct tpmfront_dev* dev = files[fd].dev; /* If we have a response waiting, then read it now from the backend * so we can get its length*/ -- generated by git-patchbot for /home/xen/git/mini-os.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |