rpms/virt-manager
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/virt-manager.git synced 2025-07-16 09:04:55 +00:00
Code Activity

Update to 0.6.1 release Disk and Network VM stats reporting VM Migration

Browse Source 
support Support adding sound devices to existing VMs Allow specifying
    device model when adding a network device to an existing VM
This commit is contained in:
Cole Robinson
2009-03-04 18:28:24 +00:00
parent cf92927c2e
commit 88233767e1
17 changed files with 4008 additions and 70750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@@ -1 +1 @@
virt-manager-0.6.0.tar.gz virt-manager-0.6.1.tar.gz

2
sources
View File

@@ -1 +1 @@
fd0acd111f180a0766b08d5f42cf5468 virt-manager-0.6.0.tar.gz 9c4eeaf447919b425f890b6bff715512 virt-manager-0.6.1.tar.gz

98
virt-manager-0.6.0-conn-details-sensitivity.patch
View File

@@ -1,98 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1221748433 14400
# Node ID 7bedb4d693bdc674392ca334e7ee94f1b818b8f8
# Parent 4148e2986cc51b01937b8bed2e103ac50e4d882a
Allow seeing connection details when conn disconnected, just desensitive all the add wizards.
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/engine.py
--- a/src/virtManager/engine.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/engine.py Thu Sep 18 10:33:53 2008 -0400
@@ -118,7 +118,8 @@
def _do_connection_changed(self, connection):
- if connection.get_state() == connection.STATE_ACTIVE:
+ if connection.get_state() == connection.STATE_ACTIVE or \
+ connection.get_state() == connection.STATE_CONNECTING:
return
hvuri = connection.get_uri()
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/host.py
--- a/src/virtManager/host.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/host.py Thu Sep 18 10:33:53 2008 -0400
@@ -29,6 +29,7 @@
from virtinst import Storage
+from virtManager.connection import vmmConnection
from virtManager.createnet import vmmCreateNetwork
from virtManager.createpool import vmmCreatePool
from virtManager.createvol import vmmCreateVolume
@@ -158,6 +159,8 @@
self.conn.connect("pool-started", self.refresh_storage_pool)
self.conn.connect("pool-stopped", self.refresh_storage_pool)
+ self.conn.connect("state-changed", self.conn_state_changed)
+
self.window.signal_autoconnect({
"on_menu_file_close_activate": self.close,
"on_vmm_host_delete_event": self.close,
@@ -181,9 +184,7 @@
})
self.conn.connect("resources-sampled", self.refresh_resources)
- self.refresh_resources()
- self.reset_pool_state()
- self.reset_net_state()
+ self.reset_state()
def show(self):
# Update autostart value
@@ -208,6 +209,12 @@
self.window.get_widget("config-autoconnect").get_active():
self.conn.toggle_autoconnect()
+ def reset_state(self):
+ self.refresh_resources()
+ self.reset_pool_state()
+ self.reset_net_state()
+ self.conn_state_changed()
+
def refresh_resources(self, ignore=None):
self.window.get_widget("performance-cpu").set_text("%d %%" % self.conn.cpu_time_percentage())
vm_memory = self.conn.pretty_current_memory()
@@ -221,6 +228,11 @@
memory_vector = self.conn.current_memory_vector()
memory_vector.reverse()
self.memory_usage_graph.set_property("data_array", memory_vector)
+
+ def conn_state_changed(self, ignore1=None):
+ state = (self.conn.get_state() == vmmConnection.STATE_ACTIVE)
+ self.window.get_widget("net-add").set_sensitive(state)
+ self.window.get_widget("pool-add").set_sensitive(state)
# -------------------------
# Virtual Network functions
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/manager.py
--- a/src/virtManager/manager.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/manager.py Thu Sep 18 10:33:53 2008 -0400
@@ -668,10 +668,8 @@
self.window.get_widget("vm-open").set_sensitive(False)
if conn.get_state() == vmmConnection.STATE_DISCONNECTED:
self.window.get_widget("vm-delete").set_sensitive(True)
- self.window.get_widget("menu_host_details").set_sensitive(False)
else:
self.window.get_widget("vm-delete").set_sensitive(False)
- self.window.get_widget("menu_host_details").set_sensitive(True)
if conn.get_state() == vmmConnection.STATE_ACTIVE:
self.window.get_widget("vm-new").set_sensitive(True)
self.window.get_widget("menu_file_restore_saved").set_sensitive(True)
@@ -680,6 +678,7 @@
self.window.get_widget("menu_file_restore_saved").set_sensitive(False)
self.window.get_widget("menu_edit_details").set_sensitive(False)
self.window.get_widget("menu_edit_delete").set_sensitive(False)
+ self.window.get_widget("menu_host_details").set_sensitive(True)
def popup_vm_menu(self, widget, event):
tuple = widget.get_path_at_pos(int(event.x), int(event.y))

19
virt-manager-0.6.0-connect-variable-typo.patch
View File

@@ -1,19 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1224534507 14400
# Node ID 57f3422417b38bb6c4d834283f7bd85c368fccf0
# Parent fd4db4f02a84dadce38293214fc04721c1a8cc15
Fix variable typo.
diff -r fd4db4f02a84 -r 57f3422417b3 src/virtManager/manager.py
--- a/src/virtManager/manager.py Mon Oct 20 10:49:21 2008 -0400
+++ b/src/virtManager/manager.py Mon Oct 20 16:28:27 2008 -0400
@@ -430,7 +430,7 @@
(gtype, host, port, transport, username) = vm.get_graphics_console()
if gtype == "vnc":
self.emit("action-show-console", uri, vmuuid)
- elif not connect.is_remote():
+ elif not connection.is_remote():
self.emit("action-show-terminal", uri, vmuuid)
else:
self.emit("action-refresh-console", uri, vmuuid)

21
virt-manager-0.6.0-fix-virt-type-desc.patch
View File

@@ -1,21 +0,0 @@
diff -rup virt-manager-0.6.0/src/vmm-create.glade new/src/vmm-create.glade
--- virt-manager-0.6.0/src/vmm-create.glade 2008-09-10 15:37:12.000000000 -0400
+++ new/src/vmm-create.glade 2008-11-25 12:08:47.161923000 -0500
@@ -871,7 +871,7 @@
<child>
<widget class="GtkLabel" id="label296">
<property name="visible">True</property>
- <property name="label" translatable="yes">Lightweight method of virtualizing machines. Limits operating system choices because the OS must be specially modified to support paravirtualization. Better performance than fully virtualized systems.</property>
+ <property name="label" translatable="yes">Lightweight method of virtualizing machines. Limits operating system choices because the OS must be specially modified to support paravirtualization, but yields better performance than fully virtualized systems.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -949,7 +949,7 @@
<child>
<widget class="GtkLabel" id="label297">
<property name="visible">True</property>
- <property name="label" translatable="yes">Involves hardware simulation, allowing for a greater range of operating systems (does not require OS modification). Slower than paravirtualized systems.</property>
+ <property name="label" translatable="yes">Involves hardware simulation, allowing for a greater range of virtual devices and operating systems (does not require OS modification).</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

18
virt-manager-0.6.0-multiple-sound-dev.patch
View File

@@ -1,18 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1224789319 14400
# Node ID 1851cbb03705561a2e603606d73eb4ebde7ac405
# Parent 4e7c3f99f0db513e0d8325c5bf485643a164f601
Don't add sound devices multiple times.
diff -r 4e7c3f99f0db -r 1851cbb03705 src/virtManager/create.py
--- a/src/virtManager/create.py Thu Oct 23 11:45:27 2008 -0400
+++ b/src/virtManager/create.py Thu Oct 23 15:15:19 2008 -0400
@@ -643,6 +643,7 @@
"".join(traceback.format_exc()))
return False
+ guest.sound_devs = []
try:
if self.get_config_sound():
guest.sound_devs.append(virtinst.VirtualAudio(model="es1370"))

13
virt-manager-0.6.0-polkit-root.patch
View File

@@ -1,13 +0,0 @@
diff -rup virt-manager-0.6.0/src/virtManager/connection.py new/src/virtManager/connection.py
--- virt-manager-0.6.0/src/virtManager/connection.py 2008-09-10 19:17:43.170355000 -0400
+++ new/src/virtManager/connection.py 2008-09-10 19:19:58.124618000 -0400
@@ -376,6 +376,9 @@ class vmmConnection(gobject.GObject):
self.connectThread.start()
def _do_creds_polkit(self, action):
+ if os.getuid() == 0:
+ logging.debug("Skipping policykit check as root")
+ return 0
logging.debug("Doing policykit for %s" % action)
bus = dbus.SessionBus()

30
virt-manager-0.6.0-populate-hostinfo-early.patch
View File

@@ -1,30 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1223313666 14400
# Node ID 270e1697b81ac143df54e111e2e1bed5006ad49c
# Parent 9f5d5b6940c5a266f7b3a087f41face4713feec2
populate hostinfo earlier in tick function so it isn't accessed uninitialized.
diff -r 9f5d5b6940c5 -r 270e1697b81a src/virtManager/connection.py
--- a/src/virtManager/connection.py Mon Oct 06 12:56:11 2008 -0400
+++ b/src/virtManager/connection.py Mon Oct 06 13:21:06 2008 -0400
@@ -869,6 +869,8 @@
if self.state != self.STATE_ACTIVE:
return
+ self.hostinfo = self.vmm.getInfo()
+
# Poll for new virtual network objects
(startNets, stopNets, newNets,
oldNets, self.nets) = self._update_nets()
@@ -911,10 +913,6 @@
# Finally, we sample each domain
now = time()
- try:
- self.hostinfo = self.vmm.getInfo()
- except:
- logging.warn("Unable to get host information")
updateVMs = self.vms
if noStatsUpdate:

97
virt-manager-0.6.0-update-potfiles.patch
View File

@@ -1,97 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1224004952 14400
# Node ID ba26f6f584144bce5f33fdc19b5e6d09adbba8d2
# Parent 7442ab043062ab4270b2de7ec23007866c7d5158
Update POTFILES to reflect reality.
diff -r 7442ab043062 -r ba26f6f58414 po/POTFILES.in
--- a/po/POTFILES.in Tue Oct 07 10:09:03 2008 -0400
+++ b/po/POTFILES.in Tue Oct 14 13:22:32 2008 -0400
@@ -1,45 +1,47 @@
src/virt-manager.desktop.in.in
-src/vmm-about.glade
-src/vmm-details.glade
-src/vmm-add-hardware.glade
-src/vmm-host.glade
-src/vmm-choose-cd.glade
-src/vmm-manager.glade
-src/vmm-create.glade
-src/vmm-open-connection.glade
-src/vmm-create-net.glade
-src/vmm-preferences.glade
-src/vmm-create-pool.glade
-src/vmm-progress.glade
-src/vmm-create-vol.glade
src/virt-manager.py.in
src/virt-manager.schemas.in
+src/virtManager/IPy.py
+src/virtManager/__init__.py
src/virtManager/about.py
+src/virtManager/addhardware.py
+src/virtManager/asyncjob.py
+src/virtManager/choosecd.py
+src/virtManager/config.py
+src/virtManager/connect.py
src/virtManager/connection.py
+src/virtManager/create.py
+src/virtManager/createmeter.py
src/virtManager/createnet.py
+src/virtManager/createpool.py
+src/virtManager/createvol.py
+src/virtManager/details.py
+src/virtManager/domain.py
src/virtManager/engine.py
-src/virtManager/IPy.py
+src/virtManager/error.py
+src/virtManager/host.py
+src/virtManager/keyring.py
+src/virtManager/manager.py
src/virtManager/netdev.py
+src/virtManager/network.py
+src/virtManager/opticalhelper.py
+src/virtManager/preferences.py
+src/virtManager/remote.py
src/virtManager/secret.py
-src/virtManager/addhardware.py
-src/virtManager/connect.py
-src/virtManager/create.py
-src/virtManager/createvol.py
-src/virtManager/createpool.py
+src/virtManager/serialcon.py
+src/virtManager/storagepool.py
src/virtManager/storagevol.py
-src/virtManager/storagepool.py
-src/virtManager/error.py
-src/virtManager/keyring.py
-src/virtManager/network.py
-src/virtManager/serialcon.py
-src/virtManager/asyncjob.py
-src/virtManager/details.py
-src/virtManager/host.py
-src/virtManager/preferences.py
-src/virtManager/config.py
-src/virtManager/createmeter.py
-src/virtManager/domain.py
-src/virtManager/__init__.py
-src/virtManager/manager.py
-src/virtManager/remote.py
src/virtManager/util.py
+src/vmm-about.glade
+src/vmm-add-hardware.glade
+src/vmm-choose-cd.glade
+src/vmm-create-net.glade
+src/vmm-create-pool.glade
+src/vmm-create-vol.glade
+src/vmm-create.glade
+src/vmm-details.glade
+src/vmm-host.glade
+src/vmm-manager.glade
+src/vmm-open-connection.glade
+src/vmm-preferences.glade
+src/vmm-progress.glade
diff -r 7442ab043062 -r ba26f6f58414 po/POTFILES.skip
--- a/po/POTFILES.skip Tue Oct 07 10:09:03 2008 -0400
+++ b/po/POTFILES.skip Tue Oct 14 13:22:32 2008 -0400
@@ -1,1 +0,0 @@
-src/virt-manager.desktop.in

70391
virt-manager-0.6.0-update-translations.patch
View File

File diff suppressed because it is too large Load Diff

20
virt-manager-0.6.0-vol-copy-popup.patch
View File

@@ -1,20 +0,0 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1224708808 14400
# Node ID c44f1d9698091da7ce8e368aba30c68b580b5c10
# Parent e3c76e40eb2e5d468c8ff61f87f1dd87ef903120
Only popup vol copy path menu on right click (not any click)
diff -r e3c76e40eb2e -r c44f1d969809 src/virtManager/host.py
--- a/src/virtManager/host.py Wed Oct 22 16:48:15 2008 -0400
+++ b/src/virtManager/host.py Wed Oct 22 16:53:28 2008 -0400
@@ -614,6 +614,9 @@
self.window.get_widget("vol-delete").set_sensitive(True)
def popup_vol_menu(self, widget, event):
+ if event.button != 3:
+ return
+
tup = widget.get_path_at_pos(int(event.x), int(event.y))
if tup == None:
return False

22
virt-manager-0.6.1-fix-cadl.patch Normal file
View File

@@ -0,0 +1,22 @@
diff -rup virt-manager-0.6.1/src/vmm-details.glade new/src/vmm-details.glade
--- virt-manager-0.6.1/src/vmm-details.glade 2009-01-26 14:33:33.000000000 -0500
+++ new/src/vmm-details.glade 2009-03-04 12:31:51.000000000 -0500
@@ -218,15 +218,15 @@
<child>
<widget class="GtkMenu" id="details-menu-send-key_menu">
<child>
- <widget class="GtkMenuItem" id="details-menu-send-cad">
+ <widget class="GtkMenuItem" id="details-menu-send-cab">
<property name="visible">True</property>
<property name="label" translatable="no">Ctrl+Alt+Backspace</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_details_menu_send_cad_activate"/>
+ <signal name="activate" handler="on_details_menu_send_cab_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="details-menu-send-cad1">
+ <widget class="GtkMenuItem" id="details-menu-send-cad">
<property name="visible">True</property>
<property name="label" translatable="no">Ctrl+Alt+Delete</property>
<property name="use_underline">True</property>

408
virt-manager-0.6.1-fix-stats-prefs.patch Normal file
View File

@@ -0,0 +1,408 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1234829084 18000
# Node ID ae434ddf4b7073773347f3d1cc449385db7267fd
# Parent 7238b8b438bc3311b744debfb576849dbc262cda
Fix regression for pre existing vm and stats preferences not keeping new values.
diff -r 7238b8b438bc -r ae434ddf4b70 src/vmm-preferences.glade
--- a/src/vmm-preferences.glade Mon Feb 16 09:35:21 2009 -0500
+++ b/src/vmm-preferences.glade Mon Feb 16 19:04:44 2009 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Jan 12 09:31:21 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Feb 12 11:56:15 2009 -->
<glade-interface>
<widget class="GtkWindow" id="vmm-preferences">
<property name="title" translatable="yes">Preferences</property>
@@ -37,19 +37,53 @@
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">samples</property>
+ <property name="label" translatable="yes">Update status every</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Maintain history of</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
+ <widget class="GtkSpinButton" id="prefs-stats-update-interval">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 60 1 5 0</property>
+ <signal name="value_changed" handler="on_prefs_stats_update_interval_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="prefs-stats-history-len">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 300 5 5 0</property>
+ <property name="climb_rate">0.01</property>
+ <signal name="value_changed" handler="on_prefs_stats_history_length_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -61,50 +95,18 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="prefs-stats-history-len">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 300 5 5 0</property>
- <property name="climb_rate">0.01</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">samples</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="prefs-stats-update-interval">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 60 1 5 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Maintain history of</property>
- </widget>
- <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Update status every</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -141,18 +143,79 @@
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-net">
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">CPU Usage</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Memory Usage</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Disk I/O</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Network I/O</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="prefs-stats-enable-cpu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_net_toggled"/>
+ <signal name="toggled" handler="on_prefs_stats_enable_cpu_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="prefs-stats-enable-mem">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_prefs_stats_enable_mem_toggled"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_EXPAND</property>
</packing>
</child>
@@ -173,80 +236,19 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-mem">
+ <widget class="GtkCheckButton" id="prefs-stats-enable-net">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_mem_toggled"/>
+ <signal name="toggled" handler="on_prefs_stats_enable_net_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="prefs-stats-enable-cpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_prefs_stats_enable_cpu_toggled"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Network I/O</property>
- </widget>
- <packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Disk I/O</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Memory Usage</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">CPU Usage</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options">GTK_EXPAND</property>
</packing>
</child>
</widget>
@@ -302,19 +304,27 @@
<property name="n_columns">1</property>
<property name="row_spacing">2</property>
<child>
- <widget class="GtkComboBox" id="prefs-console-keygrab">
+ <widget class="GtkComboBox" id="prefs-console-popup">
<property name="visible">True</property>
<property name="items" translatable="yes">Never
-When fullscreen
-On mouse over</property>
+For all new domains
+For all domains</property>
+ <signal name="changed" handler="on_prefs_console_popup_changed"/>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Automatically open consoles:</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -326,22 +336,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Automatically open consoles:</property>
- </widget>
- </child>
- <child>
- <widget class="GtkComboBox" id="prefs-console-popup">
+ <widget class="GtkComboBox" id="prefs-console-keygrab">
<property name="visible">True</property>
<property name="items" translatable="yes">Never
-For all new domains
-For all domains</property>
+When fullscreen
+On mouse over</property>
+ <signal name="changed" handler="on_prefs_console_keygrab_changed"/>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_padding">5</property>
</packing>
</child>
@@ -380,6 +384,13 @@
<property name="n_columns">1</property>
<property name="column_spacing">8</property>
<child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Install Audio Device:</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="left_padding">12</property>
@@ -417,13 +428,6 @@
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Install Audio Device:</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -470,7 +474,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-help</property>
+ <property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_prefs_help_clicked"/>
@@ -500,7 +504,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="no">gtk-close</property>
+ <property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_prefs_close_clicked"/>

3560
virt-manager-0.6.1-update-polish.patch Normal file
View File

File diff suppressed because it is too large Load Diff

4
virt-manager.console
View File

@@ -1,4 +0,0 @@
USER=root
PROGRAM=/usr/sbin/virt-manager
SESSION=true
FALLBACK=true

4
virt-manager.pam
View File

@@ -1,4 +0,0 @@
#%PAM-1.0
auth include config-util
account include config-util
session include config-util

49
virt-manager.spec
View File

@@ -7,25 +7,17 @@
%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
Name: virt-manager Name: virt-manager
Version: 0.6.0 Version: 0.6.1
Release: 5%{_extra_release} Release: 1%{_extra_release}
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
Group: Applications/Emulators Group: Applications/Emulators
License: GPLv2+ License: GPLv2+
URL: http://virt-manager.org/ URL: http://virt-manager.org/
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.pam Patch1: %{name}-%{version}-update-polish.patch
Source2: %{name}.console Patch2: %{name}-%{version}-fix-cadl.patch
Patch1: %{name}-%{version}-polkit-root.patch Patch3: %{name}-%{version}-fix-stats-prefs.patch
Patch2: %{name}-%{version}-conn-details-sensitivity.patch
Patch3: %{name}-%{version}-populate-hostinfo-early.patch
Patch4: %{name}-%{version}-update-potfiles.patch
Patch5: %{name}-%{version}-update-translations.patch
Patch6: %{name}-%{version}-multiple-sound-dev.patch
Patch7: %{name}-%{version}-vol-copy-popup.patch
Patch8: %{name}-%{version}-connect-variable-typo.patch
Patch9: %{name}-%{version}-fix-virt-type-desc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# These two are just the oldest version tested # These two are just the oldest version tested
@@ -59,14 +51,16 @@ Requires: pygtk2-libglade
Requires: librsvg2 Requires: librsvg2
# Earlier vte had broken python binding module # Earlier vte had broken python binding module
Requires: vte >= 0.12.2 Requires: vte >= 0.12.2
# For the consolehelper PAM stuff
Requires: usermode
# For online help # For online help
Requires: scrollkeeper Requires: scrollkeeper
# For console widget # For console widget
Requires: gtk-vnc-python >= 0.3.4 Requires: gtk-vnc-python >= 0.3.4
# For local authentication against PolicyKit # For local authentication against PolicyKit
%if 0%{?fedora} >= 11
Requires: PolicyKit-authentication-agent
%else if 0%{?fedora} >= 9
Requires: PolicyKit-gnome Requires: PolicyKit-gnome
%endif
BuildRequires: pygtk2-devel BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
@@ -98,12 +92,6 @@ management API.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build %build
%configure %configure
@@ -115,15 +103,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la
# Adjust for console-helper magic
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
ln -s ../bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/%{name}
%find_lang %{name} %find_lang %{name}
%clean %clean
@@ -161,10 +140,7 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS %doc README COPYING COPYING-DOCS AUTHORS ChangeLog NEWS
%{_sysconfdir}/gconf/schemas/%{name}.schemas %{_sysconfdir}/gconf/schemas/%{name}.schemas
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%{_sysconfdir}/security/console.apps/%{name}
%{_bindir}/%{name} %{_bindir}/%{name}
%{_sbindir}/%{name}
%{_libexecdir}/%{name}-launch %{_libexecdir}/%{name}-launch
%dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/
%{_libdir}/%{name}/* %{_libdir}/%{name}/*
@@ -193,6 +169,13 @@ fi
%{_datadir}/dbus-1/services/%{name}.service %{_datadir}/dbus-1/services/%{name}.service
%changelog %changelog
* Wed Mar 4 2009 Cole Robinson <crobinso@redhat.com> - 0.6.1-1.fc10
- Update to 0.6.1 release
- Disk and Network VM stats reporting
- VM Migration support
- Support adding sound devices to existing VMs
- Allow specifying device model when adding a network device to an existing VM
* Sun Dec 7 2008 Cole Robinson <crobinso@redhat.com> - 0.6.0-5.fc10 * Sun Dec 7 2008 Cole Robinson <crobinso@redhat.com> - 0.6.0-5.fc10
- Fix a spelling error in virt descriptions - Fix a spelling error in virt descriptions
- Fix gnome-python2-gnome requires regression (bz 474521) - Fix gnome-python2-gnome requires regression (bz 474521)