rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream patch for virt-v2v test harness.

Browse Source
This commit is contained in:
Richard W.M. Jones 2015-04-01 13:26:22 +01:00
parent d5ca8fb59f
commit f8dddde9a2
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-v2v-test-harness-Send-different-shift-keys-to-wake-u.patch Normal file
View File

@ -0,0 +1,41 @@
From 3034f9a658a39783cf7c99d0b00b3c7b39b061f8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 1 Apr 2015 13:24:42 +0100
Subject: [PATCH] v2v: test-harness: Send different shift keys to wake up
guests from screen blank.
See:
https://rwmj.wordpress.com/2015/03/30/tip-wake-up-a-guest-from-screen-blank/
---
v2v/test-harness/v2v_test_harness.ml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/v2v/test-harness/v2v_test_harness.ml b/v2v/test-harness/v2v_test_harness.ml
index 3bcea62..178eae8 100644
--- a/v2v/test-harness/v2v_test_harness.ml
+++ b/v2v/test-harness/v2v_test_harness.ml
@@ -176,9 +176,19 @@ let run ~test ?input_disk ?input_xml ?(test_plan = default_plan) () =
sprintf "%04d%02d%02d-%02d%02d%02d" y mo d h m s
in
+ let keys = [| "KEY_LEFTSHIFT"; "KEY_LEFTALT"; "KEY_LEFTCTRL" |] in
+ let next_key = ref 0 in
+
let take_screenshot t =
- (* Send a left shift key to wake up the screen from blanking. *)
- let cmd = sprintf "virsh send-key %s KEY_LEFTSHIFT" (quote domname) in
+ (* Send a key to wake up the screen from blanking. But don't
+ * keep on hitting the shift key as that causes Windows to get in
+ * a muddle.
+ * https://rwmj.wordpress.com/2015/03/30/tip-wake-up-a-guest-from-screen-blank/ *)
+ let key = keys.(!next_key) in
+ next_key := !next_key+1;
+ if !next_key >= Array.length keys then next_key := 0;
+
+ let cmd = sprintf "virsh send-key %s %s" (quote domname) key in
printf "%s\n%!" cmd;
ignore (Sys.command cmd);
sleep 2;
--
2.3.4

9
libguestfs.spec
View File

@ -28,13 +28,16 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.29.33 Version: 1.29.33
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
# Source and patches. # Source and patches.
URL: http://libguestfs.org/ URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
# Upstream patch for virt-v2v test harness.
Patch1: 0001-v2v-test-harness-Send-different-shift-keys-to-wake-u.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Simple)
BuildRequires: perl(Pod::Man) BuildRequires: perl(Pod::Man)
@ -806,7 +809,7 @@ for %{name}.
%setup -q %setup -q
# Apply patches, if any, here. # Apply patches, if any, here.
# (no patches) %patch1 -p1
# For Python 3 we must build libguestfs twice. This creates: # For Python 3 we must build libguestfs twice. This creates:
# %{name}-%{version}/ # %{name}-%{version}/
@ -1365,7 +1368,7 @@ popd
%changelog %changelog
* Wed Apr 01 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.33-1 * Wed Apr 01 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.33-2
- New upstream version 1.29.33. - New upstream version 1.29.33.
* Fri Mar 27 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.32-1 * Fri Mar 27 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.32-1