[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen stable-4.12] kdd: fix build again



commit 46ad8841ac4da8fc2a128e49b8406966bf5d3601
Author:     Wei Liu <wl@xxxxxxx>
AuthorDate: Fri Jul 3 20:10:01 2020 +0000
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Mon Nov 9 17:58:19 2020 +0000

    kdd: fix build again
    
    Restore Tim's patch. The one that was committed was recreated by me
    because git didn't accept my saved copy. I made some mistakes while
    recreating that patch and here we are.
    
    Fixes: 3471cafbdda3 ("kdd: stop using [0] arrays to access packet contents")
    Reported-by: Michael Young <m.a.young@xxxxxxxxxxxx>
    Signed-off-by: Wei Liu <wl@xxxxxxx>
    Reviewed-by: Tim Deegan <tim@xxxxxxx>
    Release-acked-by: Paul Durrant <paul@xxxxxxx>
    (cherry picked from commit d44cbbe0f3243afcc56e47dcfa97bbfe23e46fbb)
---
 tools/debugger/kdd/kdd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c
index 87f18559bf..30eb4408a7 100644
--- a/tools/debugger/kdd/kdd.c
+++ b/tools/debugger/kdd/kdd.c
@@ -67,11 +67,11 @@ typedef struct {
 /* State of the debugger stub */
 typedef struct {
     union {
-        uint8_t txb[sizeof (kdd_hdr)];           /* Marshalling area for tx */
+        uint8_t txb[sizeof (kdd_pkt)];           /* Marshalling area for tx */
         kdd_pkt txp;                 /* Also readable as a packet structure */
     };
     union {
-        uint8_t rxb[sizeof (kdd_hdr)];           /* Marshalling area for rx */
+        uint8_t rxb[sizeof (kdd_pkt)];           /* Marshalling area for rx */
         kdd_pkt rxp;                 /* Also readable as a packet structure */
     };
     unsigned int cur;       /* Offset into rx where we'll put the next byte */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.12



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.