diff options
| author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-07-01 14:49:15 +0100 |
|---|---|---|
| committer | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-07-01 14:49:20 +0100 |
| commit | 4e5356169ac2ef7f22e5a101d86009f706b0ff7b (patch) | |
| tree | c2829cd8c813bca8ed9a4d935317c3ca8c20d136 /src/bootchart | |
| parent | 0b2ec8a3bfdd6118b3b4958d236ee203ad420f28 (diff) | |
bootchart: do not report warning when disk is missing model.
In VMs / virtio drives there is no model. Also don't print "Disk:
(null)" in output if no model is available.
Diffstat (limited to 'src/bootchart')
| -rw-r--r-- | src/bootchart/svg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index 0ac1f55a91..a7ef653d5d 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -172,7 +172,7 @@ static int svg_title(FILE *of, const char *build, int pscount, double log_start, r = read_one_line_file(filename, &model); if (r < 0) - log_warning("Error reading disk model for %s: %m\n", rootbdev); + log_info("Error reading disk model for %s: %m\n", rootbdev); } /* various utsname parameters */ @@ -208,7 +208,8 @@ static int svg_title(FILE *of, const char *build, int pscount, double log_start, fprintf(of, "<text class=\"t2\" x=\"20\" y=\"50\">System: %s %s %s %s</text>\n", uts.sysname, uts.release, uts.version, uts.machine); fprintf(of, "<text class=\"t2\" x=\"20\" y=\"65\">CPU: %s</text>\n", cpu); - fprintf(of, "<text class=\"t2\" x=\"20\" y=\"80\">Disk: %s</text>\n", model); + if (model) + fprintf(of, "<text class=\"t2\" x=\"20\" y=\"80\">Disk: %s</text>\n", model); fprintf(of, "<text class=\"t2\" x=\"20\" y=\"95\">Boot options: %s</text>\n", cmdline); fprintf(of, "<text class=\"t2\" x=\"20\" y=\"110\">Build: %s</text>\n", build); fprintf(of, "<text class=\"t2\" x=\"20\" y=\"125\">Log start time: %.03fs</text>\n", log_start); |