[libvirt] [libvirt-designer 2/4] virtxml: Switch to use osinfo_db_identify_media

Christophe Fergeau cfergeau at redhat.com
Tue Jan 22 15:48:49 UTC 2013


virtxml is using osinfo_db_guess_os_from_media for that which
is deprecated.
---
 examples/virtxml.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/examples/virtxml.c b/examples/virtxml.c
index 18b0456..d719e5f 100644
--- a/examples/virtxml.c
+++ b/examples/virtxml.c
@@ -364,7 +364,6 @@ guess_os_from_disk(GList *disk_list)
         char *path = (char *) list_it->data;
         char *sep = strchr(path, ',');
         OsinfoMedia *media = NULL;
-        OsinfoMedia *matched_media = NULL;
 
         if (sep)
             path = g_strndup(path, sep-path);
@@ -373,15 +372,13 @@ guess_os_from_disk(GList *disk_list)
         if (!media)
             continue;
 
-        ret = osinfo_db_guess_os_from_media(db, media, &matched_media);
+        if (osinfo_db_identify_media(db, media)) {
+            g_object_get(G_OBJECT(media), "os", &ret, NULL);
+            break;
+        }
 
         if (sep)
             g_free(path);
-
-        if (ret) {
-            g_object_ref(ret);
-            break;
-        }
     }
 
     return ret;
-- 
1.8.1




More information about the libvir-list mailing list