[Xen-changelog] [xen-unstable] [TPM] Remove some stale code from the TPM backend driver. The code

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID affe80cdb4857b52a0f7bb1eb36c28977f270eae
# Parent  12f75f4e2ea88e87a11149b1c67364cfc185ce27
[TPM] Remove some stale code from the TPM backend driver. The code
used to be used for sending of vTPM control commands, but now this is
all done with the hotplug scripts.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/Kconfig           |    9 ----
 linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c |   39 ---------------------
 2 files changed, 48 deletions(-)

diff -r 12f75f4e2ea8 -r affe80cdb485 linux-2.6-xen-sparse/drivers/xen/Kconfig
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig  Fri Jul 28 17:25:20 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig  Fri Jul 28 17:33:26 2006 +0100
@@ -143,15 +143,6 @@ config XEN_TPMDEV_BACKEND
        help
          The TPM-device backend driver
 
-config XEN_TPMDEV_CLOSE_IF_VTPM_FAILS
-       bool "TPM backend closes upon vTPM failure"
-       depends on XEN_TPMDEV_BACKEND
-       default n
-       help
-         The TPM backend closes the channel if the vTPM in userspace indicates
-         a failure. The corresponding domain's channel will be closed.
-         Say Y if you want this feature.
-
 config XEN_BLKDEV_FRONTEND
        tristate "Block-device frontend driver"
        depends on XEN
diff -r 12f75f4e2ea8 -r affe80cdb485 
linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c        Fri Jul 28 
17:25:20 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c        Fri Jul 28 
17:33:26 2006 +0100
@@ -55,7 +55,6 @@ struct packet {
 
 enum {
        PACKET_FLAG_DISCARD_RESPONSE = 1,
-       PACKET_FLAG_CHECK_RESPONSESTATUS = 2,
 };
 
 /* local variables */
@@ -201,21 +200,6 @@ static void packet_free(struct packet *p
        kfree(pak);
 }
 
-static int packet_set(struct packet *pak,
-                     const unsigned char *buffer, u32 size)
-{
-       int rc = 0;
-       unsigned char *buf = kmalloc(size, GFP_KERNEL);
-
-       if (buf) {
-               pak->data_buffer = buf;
-               memcpy(buf, buffer, size);
-               pak->data_len = size;
-       } else {
-               rc = -ENOMEM;
-       }
-       return rc;
-}
 
 /*
  * Write data to the shared memory and send it to the FE.
@@ -224,29 +208,6 @@ static int packet_write(struct packet *p
                        const char *data, size_t size, int isuserbuffer)
 {
        int rc = 0;
-
-       if ((pak->flags & PACKET_FLAG_CHECK_RESPONSESTATUS)) {
-#ifdef CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS
-               u32 res;
-
-               if (copy_from_buffer(&res,
-                                    &data[2 + 4], sizeof (res),
-                                    isuserbuffer)) {
-                       return -EFAULT;
-               }
-
-               if (res != 0) {
-                       /*
-                        * Close down this device. Should have the
-                        * FE notified about closure.
-                        */
-                       if (!pak->tpmif) {
-                               return -EFAULT;
-                       }
-                       pak->tpmif->status = DISCONNECTING;
-               }
-#endif
-       }
 
        if (0 != (pak->flags & PACKET_FLAG_DISCARD_RESPONSE)) {
                /* Don't send a respone to this packet. Just acknowledge it. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog