summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/stats/events.cc2
-rw-r--r--base/traceflags.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/base/stats/events.cc b/base/stats/events.cc
index e5efceabe..d716fa4d3 100644
--- a/base/stats/events.cc
+++ b/base/stats/events.cc
@@ -134,7 +134,7 @@ InsertEvent::insert(const string &stat)
first = false;
size += sprintf(query + size, "(%u,%u,%llu)",
- event, run, curTick);
+ event, run, (unsigned long long)curTick);
}
void
diff --git a/base/traceflags.py b/base/traceflags.py
index 8f20a9692..ef13d9e2a 100644
--- a/base/traceflags.py
+++ b/base/traceflags.py
@@ -139,6 +139,7 @@ compoundFlagMap = {
'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
+ 'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ]
}