rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

Accepting request 412296 from Virtualization

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/412296
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2016-07-21 06:18:28 +00:00 committed by Git OBS Bridge
commit 26bb714e4a
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
0000-hotfix.patch
View File

@ -228,7 +228,9 @@ Index: libguestfs-1.32.4/v2v/windows_virtio.ml
- add_viostor_to_driver_database g root arch current_cs - add_viostor_to_driver_database g root arch current_cs
- else (* Windows <= 7 *) - else (* Windows <= 7 *)
- add_viostor_to_critical_device_database g root current_cs - add_viostor_to_critical_device_database g root current_cs
- +and add_guestor_to_registry g root current_cs drv_name drv_pciid =
+ let ddb_node = g#hivex_node_get_child root "DriverDatabase" in
-and add_viostor_to_critical_device_database g root current_cs = -and add_viostor_to_critical_device_database g root current_cs =
- (* See http://rwmj.wordpress.com/2010/04/30/tip-install-a-device-driver-in-a-windows-vm/ - (* See http://rwmj.wordpress.com/2010/04/30/tip-install-a-device-driver-in-a-windows-vm/
- * NB: All these edits are in the HKLM\SYSTEM hive. No other - * NB: All these edits are in the HKLM\SYSTEM hive. No other
@ -250,9 +252,7 @@ Index: libguestfs-1.32.4/v2v/windows_virtio.ml
- [ current_cs; "Control"; "CriticalDeviceDatabase"; "pci#ven_1af4&dev_1001&subsys_00021af4&rev_00" ], - [ current_cs; "Control"; "CriticalDeviceDatabase"; "pci#ven_1af4&dev_1001&subsys_00021af4&rev_00" ],
- [ "Service", REG_SZ "viostor"; - [ "Service", REG_SZ "viostor";
- "ClassGUID", REG_SZ "{4D36E97B-E325-11CE-BFC1-08002BE10318}" ]; - "ClassGUID", REG_SZ "{4D36E97B-E325-11CE-BFC1-08002BE10318}" ];
+and add_guestor_to_registry g root current_cs drv_name drv_pciid = -
+ let ddb_node = g#hivex_node_get_child root "DriverDatabase" in
- [ current_cs; "Services"; "viostor" ], - [ current_cs; "Services"; "viostor" ],
+ let regedits = + let regedits =
+ if ddb_node = 0L then + if ddb_node = 0L then
@ -545,6 +545,15 @@ Index: libguestfs-1.32.4/v2v/windows_virtio.ml
let paths = external_command cmd in let paths = external_command cmd in
List.iter ( List.iter (
fun path -> fun path ->
@@ -467,6 +284,8 @@ and virtio_iso_path_matches_guest_os pat
(6, 3, not_client)
else if pathelem "w10" || pathelem "win10" then
(10, 0, is_client)
+ else if pathelem "2k16" || pathelem "win2016" then
+ (10, 0, not_client)
else
raise Not_found in
Index: libguestfs-1.32.4/appliance/init Index: libguestfs-1.32.4/appliance/init
=================================================================== ===================================================================
--- libguestfs-1.32.4.orig/appliance/init --- libguestfs-1.32.4.orig/appliance/init

6
libguestfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 20 08:32:21 UTC 2016 - cbosdonnat@suse.com
- v2v: add support for win2k16.
Backport commit e93d4ea3, fate#316274
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 13 15:21:57 UTC 2016 - ke@suse.de Wed Jul 13 15:21:57 UTC 2016 - ke@suse.de

2
libguestfs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libguestfs # spec file for package libguestfs
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com> # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties