aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorStefan Raspl <stefan.raspl@de.ibm.com>2018-02-05 07:59:58 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2018-02-23 19:43:41 -0500
commit1cd8bfb1ed9962be6d80d5020508922aa93653ac (patch)
tree8ed58a2c8f4d4e65c979cdcdb6475ae7b16dad04 /tools
parent3df33a0f34a3883b6696bff8cc8fcda3c7444a62 (diff)
tools/kvm_stat: print error on invalid regex
Entering an invalid regular expression did not produce any indication of an error so far. To reproduce, press 'f' and enter 'foo(' (with an unescaped bracket). Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kvm/kvm_stat/kvm_stat3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
index 4e0f282c5289..08f842238c32 100755
--- a/tools/kvm/kvm_stat/kvm_stat
+++ b/tools/kvm/kvm_stat/kvm_stat
@@ -1176,6 +1176,7 @@ class Tui(object):
1176 Asks for a valid regex and sets the fields filter accordingly. 1176 Asks for a valid regex and sets the fields filter accordingly.
1177 1177
1178 """ 1178 """
1179 msg = ''
1179 while True: 1180 while True:
1180 self.screen.erase() 1181 self.screen.erase()
1181 self.screen.addstr(0, 0, 1182 self.screen.addstr(0, 0,
@@ -1184,6 +1185,7 @@ class Tui(object):
1184 self.screen.addstr(2, 0, 1185 self.screen.addstr(2, 0,
1185 "Current regex: {0}" 1186 "Current regex: {0}"
1186 .format(self.stats.fields_filter)) 1187 .format(self.stats.fields_filter))
1188 self.screen.addstr(5, 0, msg)
1187 self.screen.addstr(3, 0, "New regex: ") 1189 self.screen.addstr(3, 0, "New regex: ")
1188 curses.echo() 1190 curses.echo()
1189 regex = self.screen.getstr().decode(ENCODING) 1191 regex = self.screen.getstr().decode(ENCODING)
@@ -1198,6 +1200,7 @@ class Tui(object):
1198 self.refresh_header() 1200 self.refresh_header()
1199 return 1201 return
1200 except re.error: 1202 except re.error:
1203 msg = '"' + regex + '": Not a valid regular expression'
1201 continue 1204 continue
1202 1205
1203 def show_vm_selection_by_pid(self): 1206 def show_vm_selection_by_pid(self):