[Xen-devel] [PATCH 06 of 12] xenalyze: Relocate pio and mmio enumaration structs to their own sub-struct

[George Dunlap <george.dunlap@xxxxxxxxxxxxx>]

In preparation for the next patch, which does some MMIO reorganizing.

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

diff -r 463ac7003722 -r 910605f7ade3 xenalyze.c
--- a/xenalyze.c        Mon Nov 28 16:16:23 2011 +0000
+++ b/xenalyze.c        Mon Nov 28 16:16:23 2011 +0000
@@ -1361,7 +1361,9 @@ struct hvm_data {
         /* IPI Latency */
         struct event_cycle_summary ipi_latency;
         int ipi_count[256];
-        struct io_address *mmio, *pio;
+        struct {
+            struct io_address *mmio, *pio;
+        } io;
     } summary;
 
     /* In-flight accumulation information */
@@ -3674,7 +3676,7 @@ void enumerate_mmio(struct hvm_data *h)
     struct pf_xen_extra *e = &h->inflight.pf_xen;
 
     if ( e->mmio_data_valid )
-        update_io_address(&h->summary.mmio, e->gpa, e->mmio_is_write, 
h->arc_cycles, e->va);
+        update_io_address(&h->summary.io.mmio, e->gpa, e->mmio_is_write, 
h->arc_cycles, e->va);
 }
 
 void hvm_mmio_assist_postprocess(struct hvm_data *h)
@@ -3874,7 +3876,7 @@ void hvm_io_write_postprocess(struct hvm
                h->inflight.io.val);
     }
     if(opt.with_pio_enumeration)
-        update_io_address(&h->summary.pio, h->inflight.io.port, 1, 
h->arc_cycles, 0);
+        update_io_address(&h->summary.io.pio, h->inflight.io.port, 1, 
h->arc_cycles, 0);
 }
 
 void hvm_io_read_postprocess(struct hvm_data *h)
@@ -3886,7 +3888,7 @@ void hvm_io_read_postprocess(struct hvm_
                h->inflight.io.val);
     }
     if(opt.with_pio_enumeration)
-        update_io_address(&h->summary.pio, h->inflight.io.port, 0, 
h->arc_cycles, 0);
+        update_io_address(&h->summary.io.pio, h->inflight.io.port, 0, 
h->arc_cycles, 0);
     if(opt.scatterplot_io && h->inflight.io.port == opt.scatterplot_io_port)
         scatterplot_vs_time(h->exit_tsc, P.now - h->exit_tsc);
 }
@@ -5492,8 +5494,8 @@ void hvm_summary(struct hvm_data *h) {
        if(h->summary.ipi_count[i])
            printf("    [%3d] %10d\n",
                   i, h->summary.ipi_count[i]);
-   hvm_io_address_summary(h->summary.pio, "IO address summary:");
-   hvm_io_address_summary(h->summary.mmio, "MMIO address summary:");
+   hvm_io_address_summary(h->summary.io.pio, "IO address summary:");
+   hvm_io_address_summary(h->summary.io.mmio, "MMIO address summary:");
 }
 
 /* ---- Shadow records ---- */

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