From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 8 Nov 2011 09:58:00 +0000 (+0100)
Subject: Clean up assertion in get_boot_devices_list()
X-Git-Tag: v1.0-rc2~39
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1bf6ccd372aeb8e1a36da35fa15cf24e42f7e0b7;p=qemu-xen-4.4-testing.git

Clean up assertion in get_boot_devices_list()

g_strdup() can't fail, remove assertion.  Assert its argument can't be
null, because that's not obvious (add_boot_device_path() ensures it).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index 641629b1c..f169aac1f 100644
--- a/vl.c
+++ b/vl.c
@@ -915,8 +915,8 @@ char *get_boot_devices_list(uint32_t *size)
         } else if (devpath) {
             bootpath = devpath;
         } else {
+            assert(i->suffix);
             bootpath = g_strdup(i->suffix);
-            assert(bootpath);
         }
 
         if (total) {