Re: [Xen-devel] [PATCH] tapdisk cleanup

[grel <grelamen@xxxxxxxxx>]

I am a newbie. Can you tell me what sequence I need to go through to apply
your patch below. I tried to encapsulate it in a shell script but I got the
following errors when I ran it(I called the script taps.sh):
diff: 765b7e23d979: No such file or director
taps.sh: line 3: ---: command not found
taps.sh: line 4: +++: command not found

... and some other error. I just dont know how to apply the patch in the
first place - please tell me how.



Jun Koi wrote:
> 
> Hi Julian and Andrew,
> 
> This patch cleans tapdisk, please apply.
> 
> Sign-off-by: Jun Koi <junkoi2004@xxxxxxxxx>
> 
> diff -r 765b7e23d979 tools/blktap/drivers/tapdisk.c
> --- a/tools/blktap/drivers/tapdisk.c  Fri Sep  1 01:25:15 2006 +0100
> +++ b/tools/blktap/drivers/tapdisk.c  Fri Sep  1 19:32:37 2006 +0900
> @@ -127,18 +127,15 @@ static inline int LOCAL_FD_SET(fd_set *r
>  static inline int LOCAL_FD_SET(fd_set *readfds)
>  {
>       fd_list_entry_t *ptr;
> -     int i;
>  
>       ptr = fd_start;
>       while (ptr != NULL) {
>               if (ptr->tap_fd) {
>                       FD_SET(ptr->tap_fd, readfds);
> -                     for (i = 0; i < MAX_IOFD; i++) {
> -                             if (ptr->io_fd[i]) 
> -                                     FD_SET(ptr->io_fd[i], readfds);
> -                             maxfds = (ptr->io_fd[i] > maxfds ? 
> -                                       ptr->io_fd[i]: maxfds);
> -                     }
> +                     if (ptr->io_fd[READ]) 
> +                             FD_SET(ptr->io_fd[READ], readfds);
> +                     maxfds = (ptr->io_fd[READ] > maxfds ? 
> +                                     ptr->io_fd[READ]: maxfds);
>                       maxfds = (ptr->tap_fd > maxfds ? ptr->tap_fd: maxfds);
>               }
>               ptr = ptr->next;
> @@ -580,7 +577,7 @@ static void get_io_request(struct td_sta
>  
>  int main(int argc, char *argv[])
>  {
> -     int len, msglen, ret, i;
> +     int len, msglen, ret;
>       char *p, *buf;
>       fd_set readfds, writefds;
>       struct timeval timeout;
> @@ -633,16 +630,14 @@ int main(int argc, char *argv[])
>                            (fd_set *) 0, &timeout);
>  
>               if (ret > 0) 
> -                {
> +             {
>                       ptr = fd_start;
>                       while (ptr != NULL) {
>                               if (FD_ISSET(ptr->tap_fd, &readfds)) 
>                                       get_io_request(ptr->s);
> -                             for (i = 0; i < MAX_IOFD; i++) {
> -                                     if (ptr->io_fd[i] && 
> -                                        FD_ISSET(ptr->io_fd[i], &readfds)) 
> -                                             io_done(ptr->s, i);
> -                             }
> +                             if (ptr->io_fd[READ] && 
> +                                             FD_ISSET(ptr->io_fd[READ], 
> &readfds)) 
> +                                     io_done(ptr->s, READ);
>  
>                               ptr = ptr->next;
>                       }
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel
> 
> 

-- 
View this message in context: 
http://www.nabble.com/-PATCH--tapdisk-cleanup-tf2201859.html#a8132956
Sent from the Xen - Dev mailing list archive at Nabble.com.


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