tpmif: fix identifier prefixes

The definitions here shouldn't use vtpm_ or VPTM_ as their prefixes,
the interface should instead make use of tpmif_ and TPMIF_. This
fixes a build failure after syncing the public headers to
linux-2.6.18-xen.hg (where a struct vtpm_state already exists).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

diff --git a/include/tpmfront.h b/include/tpmfront.h
index a0c7c4d8b5971bfd326ed7508aadf2ab71f5554b..c489faec75a469bd0593ffb8f8f1029b3a894957 100644 (file)
--- a/include/tpmfront.h
+++ b/include/tpmfront.h
@@ -37,7 +37,7 @@ struct tpmfront_dev {
    grant_ref_t ring_ref;
    evtchn_port_t evtchn;
 
-   vtpm_shared_page_t *page;
+   tpmif_shared_page_t *page;
 
    domid_t bedomid;
    char* nodename;

diff --git a/tpmback.c b/tpmback.c
index 43e840d910c901683483258e1440e414fdb032b5..0601eb375d3f3f677922412d4c61256ce5e1c3cb 100644 (file)
--- a/tpmback.c
+++ b/tpmback.c
@@ -86,7 +86,7 @@ struct tpmif {
    evtchn_port_t evtchn;
 
    /* Shared page */
-   vtpm_shared_page_t *page;
+   tpmif_shared_page_t *page;
 
    enum xenbus_state state;
    enum { DISCONNECTED, DISCONNECTING, CONNECTED } status;
@@ -524,21 +524,21 @@ void free_tpmif(tpmif_t* tpmif)
 void tpmback_handler(evtchn_port_t port, struct pt_regs *regs, void *data)
 {
    tpmif_t* tpmif = (tpmif_t*) data;
-   vtpm_shared_page_t* pg = tpmif->page;
+   tpmif_shared_page_t *pg = tpmif->page;
 
    switch (pg->state)
    {
-   case VTPM_STATE_SUBMIT:
+   case TPMIF_STATE_SUBMIT:
       TPMBACK_DEBUG("EVENT CHANNEL FIRE %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle);
       tpmif_req_ready(tpmif);
       wake_up(&waitq);
       break;
-   case VTPM_STATE_CANCEL:
+   case TPMIF_STATE_CANCEL:
       /* If we are busy with a request, do nothing */
       if (tpmif->flags & TPMIF_REQ_READY)
          return;
       /* Acknowledge the cancellation if we are idle */
-      pg->state = VTPM_STATE_IDLE;
+      pg->state = TPMIF_STATE_IDLE;
       wmb();
       notify_remote_via_evtchn(tpmif->evtchn);
       return;
@@ -940,7 +940,7 @@ static void init_tpmcmd(tpmcmd_t* tpmcmd, domid_t domid, unsigned int handle, vo
 
 tpmcmd_t* get_request(tpmif_t* tpmif) {
    tpmcmd_t* cmd;
-   vtpm_shared_page_t* shr;
+   tpmif_shared_page_t *shr;
    unsigned int offset;
    int flags;
 #ifdef TPMBACK_PRINT_DEBUG
@@ -1001,7 +1001,7 @@ error:
 
 void send_response(tpmcmd_t* cmd, tpmif_t* tpmif)
 {
-   vtpm_shared_page_t* shr;
+   tpmif_shared_page_t *shr;
    unsigned int offset;
    int flags;
 #ifdef TPMBACK_PRINT_DEBUG
@@ -1033,7 +1033,7 @@ int i;
    /* clear the ready flag and send the event channel notice to the frontend */
    tpmif_req_finished(tpmif);
    barrier();
-   shr->state = VTPM_STATE_FINISH;
+   shr->state = TPMIF_STATE_FINISH;
    wmb();
    notify_remote_via_evtchn(tpmif->evtchn);
 error:

diff --git a/tpmfront.c b/tpmfront.c
index 95d86f6fcceba2471d8f33778220be86044df2ea..ce5b3e1ea99df5e79296b24f1605ced332bcfed8 100644 (file)
--- a/tpmfront.c
+++ b/tpmfront.c
@@ -47,15 +47,15 @@
 
 void tpmfront_handler(evtchn_port_t port, struct pt_regs *regs, void *data) {
    struct tpmfront_dev* dev = (struct tpmfront_dev*) data;
-   vtpm_shared_page_t* shr = dev->page;
+   tpmif_shared_page_t *shr = dev->page;
    /*If we get a response when we didnt make a request, just ignore it */
    if(!dev->waiting) {
       return;
    }
 
    switch (shr->state) {
-   case VTPM_STATE_FINISH: /* request was completed */
-   case VTPM_STATE_IDLE:   /* request was cancelled */
+   case TPMIF_STATE_FINISH: /* request was completed */
+   case TPMIF_STATE_IDLE:   /* request was cancelled */
       break;
    default:
       /* Spurious wakeup; do nothing, request is still pending */
@@ -203,7 +203,7 @@ static int tpmfront_connect(struct tpmfront_dev* dev)
 {
    char* err;
    /* Create shared page */
-   dev->page = (vtpm_shared_page_t*) alloc_page();
+   dev->page = (tpmif_shared_page_t *)alloc_page();
    if(dev->page == NULL) {
       TPMFRONT_ERR("Unable to allocate page for shared memory\n");
       goto error;
@@ -400,7 +400,7 @@ void shutdown_tpmfront(struct tpmfront_dev* dev)
 int tpmfront_send(struct tpmfront_dev* dev, const uint8_t* msg, size_t length)
 {
    unsigned int offset;
-   vtpm_shared_page_t* shr = NULL;
+   tpmif_shared_page_t *shr = NULL;
 #ifdef TPMFRONT_PRINT_DEBUG
    int i;
 #endif
@@ -431,7 +431,7 @@ int tpmfront_send(struct tpmfront_dev* dev, const uint8_t* msg, size_t length)
    memcpy(offset + (uint8_t*)shr, msg, length);
    shr->length = length;
    barrier();
-   shr->state = VTPM_STATE_SUBMIT;
+   shr->state = TPMIF_STATE_SUBMIT;
 
    dev->waiting = 1;
    dev->resplen = 0;
@@ -449,7 +449,7 @@ int tpmfront_send(struct tpmfront_dev* dev, const uint8_t* msg, size_t length)
 int tpmfront_recv(struct tpmfront_dev* dev, uint8_t** msg, size_t *length)
 {
    unsigned int offset;
-   vtpm_shared_page_t* shr = NULL;
+   tpmif_shared_page_t *shr = NULL;
 #ifdef TPMFRONT_PRINT_DEBUG
 int i;
 #endif
@@ -466,7 +466,7 @@ int i;
    *length = 0;
    offset = sizeof(*shr);
 
-   if (shr->state != VTPM_STATE_FINISH)
+   if (shr->state != TPMIF_STATE_FINISH)
       goto quit;
 
    *length = shr->length;