Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 3160499aacb81f6735941eb4c372d87a > files > 467

kvm-83-164.el5_5.30.src.rpm

From 4e4f4535fe5038be3c0b9d3f7b7e1d9b897205ec Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 24 Apr 2009 12:17:30 -0300
Subject: [PATCH 03/16] kvmtrace_format: read /usr/share/kvm/formats by default

https://bugzilla.redhat.com/show_bug.cgi?id=496582

Patch proposed by Alan Pevec on bugzilla.

This will make it easier to use the packaged kvmtrace_format script.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 501729
Message-Id: <1240587575-24841-1-git-send-email-ehabkost@redhat.com>
RH-Upstream-status: pending
Acked-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Acked-by: Dor Laor <dlaor@redhat.com>
---
 user/kvmtrace_format |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user/kvmtrace_format b/user/kvmtrace_format
index 10eb1fe..161d2aa 100755
--- a/user/kvmtrace_format
+++ b/user/kvmtrace_format
@@ -362,9 +362,6 @@ def get_special(instr):
 
 summary = False
 
-if len(sys.argv) < 2:
-    usage()
-
 try:
     opts, arg = getopt.getopt(sys.argv[1:], "sc:" )
     for opt in opts:
@@ -379,7 +376,10 @@ signal.signal(signal.SIGINT,  sighand)
 
 interrupted = 0
 
-defs = read_defs(arg[0])
+if len(arg) > 0:
+    defs = read_defs(arg[0])
+else:
+    defs = read_defs("/usr/share/kvm/formats")
 
 # structure of trace record (as output by kvmtrace):
 # HDR(I) {TSC(Q)} D1(I) D2(I) D3(I) D4(I) D5(I)
-- 
1.6.3.rc4.29.g8146