diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-25 09:03:39 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-25 11:20:35 +0100 |
commit | 729bb9c6b5ae0c0e7c68dc802b1617936062f966 (patch) | |
tree | 29d163c888a727dec893bde7277a8f452f235420 /python/t | |
parent | 78a515ec4a4e8650bd2e1ffc0bfbb97b9568306d (diff) | |
download | libguestfs-729bb9c6b5ae0c0e7c68dc802b1617936062f966.tar.gz libguestfs-729bb9c6b5ae0c0e7c68dc802b1617936062f966.tar.xz libguestfs-729bb9c6b5ae0c0e7c68dc802b1617936062f966.zip |
launch: Treat /dev/null specially, for old KVM.
Old KVM can't add /dev/null readonly. Treat /dev/null as a special
case.
We also fix a few tests where /dev/null was being used with
format=qcow2. This was always incorrect behaviour, but qemu appears
to tolerate it.
Diffstat (limited to 'python/t')
-rw-r--r-- | python/t/060-optargs.py | 2 | ||||
-rw-r--r-- | python/t/rhbz811650.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/python/t/060-optargs.py b/python/t/060-optargs.py index 75ea06f3..be28a3ce 100644 --- a/python/t/060-optargs.py +++ b/python/t/060-optargs.py @@ -21,5 +21,5 @@ import guestfs g = guestfs.GuestFS() g.add_drive_opts ("/dev/null") g.add_drive_opts ("/dev/null", readonly = 1) -g.add_drive_opts ("/dev/null", iface = "virtio", format = "qcow2") +g.add_drive_opts ("/dev/null", iface = "virtio", format = "raw") g.close () diff --git a/python/t/rhbz811650.py b/python/t/rhbz811650.py index 84daf0fe..cf01673f 100644 --- a/python/t/rhbz811650.py +++ b/python/t/rhbz811650.py @@ -15,11 +15,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import os import guestfs +f = open ("test.img", "w") +f.truncate (500 * 1024 * 1024) +f.close () + g = guestfs.GuestFS () -g.add_drive_opts ("/dev/null", format="qcow2"); +# Deliberate error: the disk format is supposed to be raw. +g.add_drive_opts ("test.img", format="qcow2"); # Because error() wasn't being called, guestfs_last_error would return # NULL, causing a segfault in the Python bindings (RHBZ#811650). @@ -27,3 +33,5 @@ try: g.launch () except: pass + +os.unlink ("test.img") |