|
 |
4ab194 |
From afa84a03c2584a971b54bd3a69ecb4429d517630 Mon Sep 17 00:00:00 2001
|
|
|
4ab194 |
From: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
4ab194 |
Date: Mon, 22 Sep 2014 14:15:00 +0200
|
|
|
4ab194 |
Subject: [PATCH] ovirt: Allow to remove CD images
|
|
|
4ab194 |
|
|
|
4ab194 |
It turns out this is supposed to be done through update requests with a
|
|
|
4ab194 |
CD image with an empty name, which is what the current code tries to do.
|
|
|
4ab194 |
The only reason it's not working is because of server-side bugs with
|
|
|
4ab194 |
oVirt < 3.5
|
|
|
4ab194 |
The requirement on libgovirt is raised to 0.3.2 as
|
|
|
4ab194 |
a small change is needed as well in libgovirt to allow empty filenames:
|
|
|
4ab194 |
https://git.gnome.org/browse/libgovirt/commit/?id=bdb788fcc
|
|
|
4ab194 |
|
|
|
4ab194 |
Without this change, nothing too bad will happen, but the CD won't be
|
|
|
4ab194 |
removed and warnings will be logged in the console.
|
|
|
4ab194 |
|
|
|
4ab194 |
(cherry picked from commit 9803f9cb420368e38117c5789777a6eeda5efbbd)
|
|
|
4ab194 |
---
|
|
|
4ab194 |
src/ovirt-foreign-menu.c | 4 ----
|
|
|
4ab194 |
1 file changed, 4 deletions(-)
|
|
|
4ab194 |
|
|
|
4ab194 |
diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
|
|
|
4ab194 |
index 6fc9577..c813fed 100644
|
|
|
4ab194 |
--- a/src/ovirt-foreign-menu.c
|
|
|
4ab194 |
+++ b/src/ovirt-foreign-menu.c
|
|
|
4ab194 |
@@ -450,10 +450,6 @@ ovirt_foreign_menu_activate_item_cb(GtkMenuItem *menuitem, gpointer user_data)
|
|
|
4ab194 |
g_debug("Removing current cdrom image");
|
|
|
4ab194 |
iso_name = NULL;
|
|
|
4ab194 |
foreign_menu->priv->next_iso_name = NULL;
|
|
|
4ab194 |
- /* FIXME: No idea how to remove a CDRom from a VM through ovirt REST
|
|
|
4ab194 |
- * API for now, so return early.
|
|
|
4ab194 |
- */
|
|
|
4ab194 |
- return;
|
|
|
4ab194 |
}
|
|
|
4ab194 |
g_object_set(foreign_menu->priv->cdrom,
|
|
|
4ab194 |
"file", iso_name,
|