samples: mpssd: fix the build errors when enable DEBUG in mpssd.c
authorSherry Sun <sherry.sun@nxp.com>
Fri, 25 Sep 2020 07:18:28 +0000 (15:18 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Oct 2020 09:38:39 +0000 (11:38 +0200)
If enable DEBUG, will meet the following errors when build mpssd, so fix
them here. Only one error is listed here, other errors are similar.

mpssd.c: In function ‘virtio_net’:
mpssd.c:615:21: error: incompatible type for argument 2 of ‘disp_iovec’
     disp_iovec(mic, copy, __func__, __LINE__);
                     ^~~~
mpssd.c:361:1: note: expected ‘struct mic_copy_desc *’ but argument is of type ‘struct mic_copy_desc’
 disp_iovec(struct mic_info *mic, struct mic_copy_desc *copy,
 ^~~~~~~~~~

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
Link: https://lore.kernel.org/r/20200925071831.8025-2-sherry.sun@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
samples/mic/mpssd/mpssd.c

index a11bf6c..51d0354 100644 (file)
@@ -612,7 +612,7 @@ virtio_net(void *arg)
                                        copy.out_len, hdr->gso_type);
 #endif
 #ifdef DEBUG
-                               disp_iovec(mic, copy, __func__, __LINE__);
+                               disp_iovec(mic, &copy, __func__, __LINE__);
                                mpsslog("%s %s %d read from tap 0x%lx\n",
                                        mic->name, __func__, __LINE__,
                                        len);
@@ -632,7 +632,7 @@ virtio_net(void *arg)
                                if (!err)
                                        verify_out_len(mic, &copy);
 #ifdef DEBUG
-                               disp_iovec(mic, copy, __func__, __LINE__);
+                               disp_iovec(mic, &copy, __func__, __LINE__);
                                mpsslog("%s %s %d wrote to net 0x%lx\n",
                                        mic->name, __func__, __LINE__,
                                        sum_iovec_len(&copy));
@@ -681,12 +681,12 @@ virtio_net(void *arg)
                                                sizeof(struct virtio_net_hdr);
                                        verify_out_len(mic, &copy);
 #ifdef DEBUG
-                                       disp_iovec(mic, copy, __func__,
+                                       disp_iovec(mic, &copy, __func__,
                                                   __LINE__);
                                        mpsslog("%s %s %d ",
                                                mic->name, __func__, __LINE__);
                                        mpsslog("read from net 0x%lx\n",
-                                               sum_iovec_len(copy));
+                                               sum_iovec_len(&copy));
 #endif
                                        len = writev(net_poll[NET_FD_TUN].fd,
                                                copy.iov, copy.iovcnt);
@@ -814,7 +814,7 @@ virtio_console(void *arg)
                        len = readv(pty_fd, copy.iov, copy.iovcnt);
                        if (len > 0) {
 #ifdef DEBUG
-                               disp_iovec(mic, copy, __func__, __LINE__);
+                               disp_iovec(mic, &copy, __func__, __LINE__);
                                mpsslog("%s %s %d read from tap 0x%lx\n",
                                        mic->name, __func__, __LINE__,
                                        len);
@@ -834,10 +834,10 @@ virtio_console(void *arg)
                                if (!err)
                                        verify_out_len(mic, &copy);
 #ifdef DEBUG
-                               disp_iovec(mic, copy, __func__, __LINE__);
+                               disp_iovec(mic, &copy, __func__, __LINE__);
                                mpsslog("%s %s %d wrote to net 0x%lx\n",
                                        mic->name, __func__, __LINE__,
-                                       sum_iovec_len(copy));
+                                       sum_iovec_len(&copy));
 #endif
                                /* Reinitialize IOV for next run */
                                iov0->iov_len = PAGE_SIZE;
@@ -866,12 +866,12 @@ virtio_console(void *arg)
                                        iov1->iov_len = copy.out_len;
                                        verify_out_len(mic, &copy);
 #ifdef DEBUG
-                                       disp_iovec(mic, copy, __func__,
+                                       disp_iovec(mic, &copy, __func__,
                                                   __LINE__);
                                        mpsslog("%s %s %d ",
                                                mic->name, __func__, __LINE__);
                                        mpsslog("read from net 0x%lx\n",
-                                               sum_iovec_len(copy));
+                                               sum_iovec_len(&copy));
 #endif
                                        len = writev(pty_fd,
                                                copy.iov, copy.iovcnt);
@@ -883,7 +883,7 @@ virtio_console(void *arg)
                                                        sum_iovec_len(&copy));
                                        } else {
 #ifdef DEBUG
-                                               disp_iovec(mic, copy, __func__,
+                                               disp_iovec(mic, &copy, __func__,
                                                           __LINE__);
                                                mpsslog("%s %s %d ",
                                                        mic->name, __func__,