Codebase list virt-viewer / be0dd05
Update libgovirt requirements Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com> Eduardo Lima (Etrunko) 2 years ago
3 changed file(s) with 6 addition(s) and 42 deletion(s). Raw diff Collapse all Expand all
+2
-17
config.h.in less more
3838 /* Have libgovirt? */
3939 #mesondefine HAVE_OVIRT
4040
41 /* Define to 1 if you have the `ovirt_api_search_vms' function. */
42 #undef HAVE_OVIRT_API_SEARCH_VMS
43
44 /* Define to 1 if you have the `ovirt_cluster_get_data_center' function. */
45 #undef HAVE_OVIRT_CLUSTER_GET_DATA_CENTER
46
47 /* Have support for data center */
48 #undef HAVE_OVIRT_DATA_CENTER
49
50 /* Define to 1 if you have the `ovirt_host_get_cluster' function. */
51 #undef HAVE_OVIRT_HOST_GET_CLUSTER
52
53 /* Define to 1 if you have the `ovirt_storage_domain_get_disks' function. */
54 #undef HAVE_OVIRT_STORAGE_DOMAIN_GET_DISKS
55
56 /* Define to 1 if you have the `ovirt_vm_get_host' function. */
57 #undef HAVE_OVIRT_VM_GET_HOST
41 /* Have ovirt_storage_domain_get_disks function? */
42 #mesondefine HAVE_OVIRT_STORAGE_DOMAIN_GET_DISKS
5843
5944 /* Have spice-gtk? */
6045 #mesondefine HAVE_SPICE_GTK
+4
-1
meson.build less more
3737 gtk_vnc_min_version='>=0.4.0'
3838 spice_gtk_min_version='>=0.35'
3939 spice_protocol_min_version='>=0.12.7'
40 govirt_min_version='>=0.3.3'
40 govirt_min_version='>=0.3.7'
4141 rest_min_version='>=0.8'
4242 vte_min_version='>=0.46.0'
4343 bash_completion_version='2.0'
445445 endif
446446 endif
447447 if govirt_dep.found()
448 if cc.has_function('ovirt_storage_domain_get_disks', dependencies: govirt_dep)
449 conf_data.set('HAVE_OVIRT_STORAGE_DOMAIN_GET_DISKS', '1')
450 endif
448451 conf_data.set('HAVE_OVIRT', '1')
449452 endif
450453
+0
-24
src/ovirt-foreign-menu.c less more
5353 STATE_0,
5454 STATE_API,
5555 STATE_VM,
56 #ifdef HAVE_OVIRT_DATA_CENTER
5756 STATE_HOST,
5857 STATE_CLUSTER,
5958 STATE_DATA_CENTER,
60 #endif
6159 STATE_STORAGE_DOMAIN,
6260 STATE_VM_CDROM,
6361 STATE_CDROM_FILE,
6765 static void ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, GTask *task, OvirtForeignMenuState state);
6866 static void ovirt_foreign_menu_fetch_api_async(OvirtForeignMenu *menu, GTask *task);
6967 static void ovirt_foreign_menu_fetch_vm_async(OvirtForeignMenu *menu, GTask *task);
70 #ifdef HAVE_OVIRT_DATA_CENTER
7168 static void ovirt_foreign_menu_fetch_host_async(OvirtForeignMenu *menu, GTask *task);
7269 static void ovirt_foreign_menu_fetch_cluster_async(OvirtForeignMenu *menu, GTask *task);
7370 static void ovirt_foreign_menu_fetch_data_center_async(OvirtForeignMenu *menu, GTask *task);
74 #endif
7571 static void ovirt_foreign_menu_fetch_storage_domain_async(OvirtForeignMenu *menu, GTask *task);
7672 static void ovirt_foreign_menu_fetch_vm_cdrom_async(OvirtForeignMenu *menu, GTask *task);
7773 static void ovirt_foreign_menu_refresh_cdrom_file_async(OvirtForeignMenu *menu, GTask *task);
8379 OvirtProxy *proxy;
8480 OvirtApi *api;
8581 OvirtVm *vm;
86 #ifdef HAVE_OVIRT_DATA_CENTER
8782 OvirtHost *host;
8883 OvirtCluster *cluster;
8984 OvirtDataCenter *data_center;
90 #endif
9185 char *vm_guid;
9286
9387 OvirtCollection *files;
214208 g_clear_object(&self->proxy);
215209 g_clear_object(&self->api);
216210 g_clear_object(&self->vm);
217 #ifdef HAVE_OVIRT_DATA_CENTER
218211 g_clear_object(&self->host);
219212 g_clear_object(&self->cluster);
220213 g_clear_object(&self->data_center);
221 #endif
222214 g_clear_pointer(&self->vm_guid, g_free);
223215 g_clear_object(&self->files);
224216 g_clear_object(&self->cdrom);
332324 ovirt_foreign_menu_fetch_vm_async(menu, task);
333325 break;
334326 }
335 #ifdef HAVE_OVIRT_DATA_CENTER
336327 G_GNUC_FALLTHROUGH;
337328 case STATE_HOST:
338329 if (menu->host == NULL) {
351342 ovirt_foreign_menu_fetch_data_center_async(menu, task);
352343 break;
353344 }
354 #endif
355345 G_GNUC_FALLTHROUGH;
356346 case STATE_STORAGE_DOMAIN:
357347 if (menu->files == NULL) {
647637 cdroms_fetched_cb, task);
648638 }
649639
650 #ifdef HAVE_OVIRT_DATA_CENTER
651640 static gboolean strv_contains(const gchar * const *strv, const gchar *str)
652641 {
653642 return g_strv_contains (strv, str);
668657
669658 return match;
670659 }
671 #endif
672660
673661 static gboolean storage_domain_validate(OvirtForeignMenu *menu G_GNUC_UNUSED,
674662 OvirtStorageDomain *domain)
689677 ret = FALSE;
690678 }
691679
692 #ifdef HAVE_OVIRT_DATA_CENTER
693680 if (!storage_domain_attached_to_data_center(domain, menu->data_center)) {
694681 g_debug("Storage domain '%s' is not attached to data center", name);
695682 ret = FALSE;
696683 }
697 #endif
698684
699685 g_debug ("Storage domain '%s' is %s", name, ret ? "valid" : "not valid");
700686 g_free(name);
793779 {
794780 OvirtCollection *collection = NULL;
795781
796 #ifdef HAVE_OVIRT_DATA_CENTER
797782 g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu));
798783 g_return_if_fail(OVIRT_IS_PROXY(menu->proxy));
799784 g_return_if_fail(OVIRT_IS_DATA_CENTER(menu->data_center));
800785
801786 collection = ovirt_data_center_get_storage_domains(menu->data_center);
802 #else
803 collection = ovirt_api_get_storage_domains(menu->api);
804 #endif
805787
806788 g_debug("Start fetching iso file collection");
807789 ovirt_collection_fetch_async(collection, menu->proxy,
810792 }
811793
812794
813 #ifdef HAVE_OVIRT_DATA_CENTER
814795 static void data_center_fetched_cb(GObject *source_object,
815796 GAsyncResult *result,
816797 gpointer user_data)
920901 host_fetched_cb,
921902 task);
922903 }
923 #endif /* HAVE_OVIRT_DATA_CENTER */
924904
925905
926906 static void vms_fetched_cb(GObject *source_object,
977957 g_return_if_fail(OVIRT_IS_PROXY(menu->proxy));
978958 g_return_if_fail(OVIRT_IS_API(menu->api));
979959
980 #ifdef HAVE_OVIRT_API_SEARCH_VMS
981960 char * query = g_strdup_printf("id=%s", menu->vm_guid);
982961 vms = ovirt_api_search_vms(menu->api, query);
983962 g_free(query);
984 #else
985 vms = ovirt_api_get_vms(menu->api);
986 #endif
987963
988964 ovirt_collection_fetch_async(vms, menu->proxy,
989965 g_task_get_cancellable(task),