OpenStack Compute (nova)

Merge lp:~zulcss/nova/lp805083 into lp:~hudson-openstack/nova/trunk

  1. lp805083
  2. Merge into trunk
Proposed by Chuck Short
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1245
Merged at revision: 1248
Proposed branch: lp:~zulcss/nova/lp805083
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/virt/libvirt/connection.py (+1/-1)
To merge this branch: bzr merge lp:~zulcss/nova/lp805083
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Brian Lamar (community) Approve
Review via email: mp+66896@code.launchpad.net

Commit message

Fixes Bug #805083: "libvirtError: internal error cannot determine default video type" when using UML

To post a comment you must log in.
Revision history for this message
Brian Lamar (blamar) wrote :

Makes sense to me, and not something testable as far as I know. Thanks!

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

completely reasonable

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt/connection.py'
2--- nova/virt/libvirt/connection.py 2011-06-29 17:58:10 +0000
3+++ nova/virt/libvirt/connection.py 2011-07-05 12:36:03 +0000
4@@ -1015,7 +1015,7 @@
5 'volumes': block_device_mapping}
6
7 if FLAGS.vnc_enabled:
8- if FLAGS.libvirt_type != 'lxc':
9+ if FLAGS.libvirt_type != 'lxc' or FLAGS.libvirt_type != 'uml':
10 xml_info['vncserver_host'] = FLAGS.vncserver_host
11 xml_info['vnc_keymap'] = FLAGS.vnc_keymap
12 if not rescue: