From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Date: Wed, 1 Jul 2015 13:49:15 +0000 (+0100)
Subject: bootchart: do not report warning when disk is missing model.
X-Git-Tag: v222~52^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F460%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 0ac1f55a918..a7ef653d5d0 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);