9:51 a.m.
**NOTE: For review only, not to be applied**
https://bugzilla.redhat.com/show_bug.cgi?id=1190669
Historically virt-v2v has been able to install the viostor (Windows
virtio-blk) driver into a Windows <= 7 guest Critical Device Database
(CDD), allowing the guest to boot on the target hypervisor. The guest
then runs a firstboot script which reinstalls the viostor driver
properly and installs all the other virtio drivers.
However this never worked with Windows >= 8.
The reason it didn't work is because Windows >= 8 drops all support
for the CDD, replacing it with another driver database in the
registry.
The attached patches (mainly the second one) make the conversion work
for Windows >= 8.
The registry changes are considerably more intrusive than for Windows
with the CDD, so I'm rather less sure that this patch is a good idea.
Specific areas of concern include:
- What is "oem1.inf"?
- Where does the magic string "c86329aaeb0a7904" come from?
- Will reinstallation of viostor create a second viostor driver
entry? (This needs testing)
- Is GUID 4d36e97b-e325-11ce-bfc1-08002be10318 guaranteed to
exist?
- Do we need to set the right DriverVersion?
- Do we need to place viostor.inf somewhere in the guest filesystem?
It seems work without this file.
Note I only tested this on Windows 8.1 64 bit so far.
Rich.
9:51 a.m.
New subject: [PATCH v1 DO NOT APPLY 1/2] v2v: Add support for REG_MULTI_SZ (multiple strings) to registry editor.
---
mllib/regedit.ml | 8 ++++++++
mllib/regedit.mli | 1 +
2 files changed, 9 insertions(+)
diff --git a/mllib/regedit.ml b/mllib/regedit.ml
index 673b215..0291fe4 100644
--- a/mllib/regedit.ml
+++ b/mllib/regedit.ml
@@ -30,6 +30,7 @@ and regtype =
| REG_EXPAND_SZ of string
| REG_BINARY of string
| REG_DWORD of int32
+| REG_MULTI_SZ of string list
(* Take a 7 bit ASCII string and encode it as UTF16LE. *)
let encode_utf16le str =
@@ -97,5 +98,12 @@ and import_value g node = function
g#hivex_node_set_value node key 3L bin
| key, REG_DWORD dw ->
g#hivex_node_set_value node key 4L (le32_of_int (Int64.of_int32 dw))
+ | key, REG_MULTI_SZ ss ->
+ (* http://blogs.msdn.com/oldnewthing/archive/2009/10/08/9904646.aspx *)
+ List.iter (fun s -> assert (s <> "")) ss;
+ let ss = ss @ [""] in
+ let ss = List.map (fun s -> encode_utf16le s ^ "\000\000") ss in
+ let ss = String.concat "" ss in
+ g#hivex_node_set_value node key 7L ss
let reg_import g root = List.iter (import_key g root)
diff --git a/mllib/regedit.mli b/mllib/regedit.mli
index 1f43cdd..985e405 100644
--- a/mllib/regedit.mli
+++ b/mllib/regedit.mli
@@ -47,6 +47,7 @@ and regtype =
| REG_EXPAND_SZ of string (** String with %env% *)
| REG_BINARY of string (** Blob of binary data *)
| REG_DWORD of int32 (** Little endian 32 bit integer *)
+| REG_MULTI_SZ of string list (** List of strings *)
(* There are more types in the Registry, but we don't support them here... *)
(** Registry value type and data.
--
2.3.1
9:51 a.m.
New subject: [PATCH v1 DO NOT APPLY 2/2] v2v: Support conversion of Windows >= 8 (RHBZ#1190669).
Tested on:
- Windows 8.1 Pro 64 bit
---
v2v/convert_windows.ml | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 199 insertions(+)
diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
index e966341..f9517a8 100644
--- a/v2v/convert_windows.ml
+++ b/v2v/convert_windows.ml
@@ -329,6 +329,14 @@ echo uninstalling Xen PV driver
(block, net)
and add_viostor_to_critical_device_database root current_cs =
+ let { i_major_version = major; i_minor_version = minor;
+ i_arch = arch } = inspect in
+ if (major == 6 && minor >= 2) || major >= 7 then (* Windows >= 8 *)
+ add_viostor_to_critical_device_database_ddb root arch current_cs
+ else (* Windows <= 7 *)
+ add_viostor_to_critical_device_database_cddb root current_cs
+
+ and add_viostor_to_critical_device_database_cddb root current_cs =
(* See
http://rwmj.wordpress.com/2010/04/30/tip-install-a-device-driver-in-a-win...
* NB: All these edits are in the HKLM\SYSTEM hive. No other
* hive may be modified here.
@@ -382,6 +390,197 @@ echo uninstalling Xen PV driver
reg_import g root regedits
+ and add_viostor_to_critical_device_database_ddb root arch current_cs =
+ (* Windows >= 8 doesn't use the CriticalDeviceDatabase. Instead
+ * one must add keys into the DriverDatabase.
+ *)
+
+ let viostor_inf =
+ let arch =
+ match arch with
+ | "x86_64" -> "amd64"
+ | "i386" | "i486" | "i585" | "i686" ->
"x86"
+ | _ ->
+ error (f_"when adding viostor to the DriverDatabase, unknown
architecture: %s") arch in
+ (* XXX I don't know what the significance of the c863.. string is. It
+ * may even be random.
+ *)
+ sprintf "viostor.inf_%s_%s" arch "c86329aaeb0a7904" in
+
+ let scsi_adapter_guid = "{4d36e97b-e325-11ce-bfc1-08002be10318}" in
+ let oem1_inf = "oem1.inf" in
+
+ (* There should be a key
+ * HKLM\SYSTEM\DriverDatabase\DeviceIds\{4d36e97b-e325-11ce-bfc1-08002be10318}.
+ * We want to add:
+ * "oem1.inf"=hex(0):
+ *)
+ let () =
+ let node =
+ try get_node root [ "DriverDatabase"; "DeviceIds";
scsi_adapter_guid ]
+ with Not_found ->
+ error (f_"cannot find HKLM\\SYSTEM\\DriverDatabase\\DeviceIds\\%s in the
guest registry") scsi_adapter_guid in
+ g#hivex_node_set_value node oem1_inf (* REG_NONE *) 0_L "" in
+
+ (* There should be a key
+ * HKLM\SYSTEM\ControlSet001\Control\Class\{4d36e97b-e325-11ce-bfc1-08002be10318}
+ * There may be subkey(s) of this called "0000", "0001" etc. We
want
+ * to create the next free subkey.
+ *)
+ let controller_path =
+ [ current_cs; "Control"; "Class"; scsi_adapter_guid ] in
+ let controller_offset =
+ let node =
+ try get_node root controller_path
+ with Not_found ->
+ error (f_"cannot find HKLM\\SYSTEM\\%s in the guest registry")
+ (String.concat "\\" controller_path) in
+ let rec loop node i =
+ let controller_offset = sprintf "%04d" i in
+ let child = g#hivex_node_get_child node controller_offset in
+ if child = 0_L then controller_offset else loop node (i+1)
+ in
+ loop node 0 in
+
+ let regedits = [
+ controller_path @ [ controller_offset ],
+ [ "DriverDate", REG_SZ "6-4-2014";
+ "DriverDateData", REG_BINARY
"\x00\x40\x90\xed\x87\x7f\xcf\x01";
+ "DriverDesc", REG_SZ "Red Hat VirtIO SCSI controller";
+ "DriverVersion", REG_SZ "62.71.104.8600" (* XXX *);
+ "InfPath", REG_SZ oem1_inf;
+ "InfSection", REG_SZ "rhelscsi_inst";
+ "MatchingDeviceId", REG_SZ
"PCI\\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00";
+ "ProviderName", REG_SZ "Red Hat, Inc." ];
+
+ [ current_cs; "Enum"; "PCI";
"VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\\3&13c0b0c5&0&38"
],
+ [ "Capabilities", REG_DWORD 0x6_l;
+ "ClassGUID", REG_SZ scsi_adapter_guid;
+ "CompatibleIDs", REG_MULTI_SZ [
+ "PCI\\VEN_1AF4&DEV_1001&REV_00";
+ "PCI\\VEN_1AF4&DEV_1001";
+ "PCI\\VEN_1AF4&CC_010000";
+ "PCI\\VEN_1AF4&CC_0100";
+ "PCI\\VEN_1AF4";
+ "PCI\\VEN_010000";
+ "PCI\\VEN_0100";
+ ];
+ "ConfigFlags", REG_DWORD 0_l;
+ "ContainerID", REG_SZ
"{00000000-0000-0000-ffff-ffffffffffff}";
+ "DeviceDesc", REG_SZ (sprintf "(a)%s,%%rhelscsi.devicedesc%%;Red
Hat VirtIO SCSI controller" oem1_inf);
+ "Driver", REG_SZ (sprintf "%s\\%s" scsi_adapter_guid
controller_offset);
+ "HardwareID", REG_MULTI_SZ [
+
"PCI\\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00";
+ "PCI\\VEN_1AF4&DEV_1001&SUBSYS_00021AF4";
+ "PCI\\VEN_1AF4&DEV_1001&CC_010000";
+ "PCI\\VEN_1AF4&DEV_1001&CC_0100";
+ ];
+ "LocationInformation", REG_SZ
"(a)System32\\drivers\\pci.sys,#65536;PCI bus %1, device %2, function
%3;(0,7,0)";
+ "Mfg", REG_SZ (sprintf "@%s,%%rhel%%;Red Hat, Inc."
oem1_inf);
+ "ParentIdPrefix", REG_SZ "4&87f7bfb&0";
+ "Service", REG_SZ "viostor";
+ "UINumber", REG_DWORD 0x7_l ];
+
+ [ current_cs; "Services"; "viostor" ],
+ [ "ErrorControl", REG_DWORD 0x1_l;
+ "Group", REG_SZ "SCSI miniport";
+ "ImagePath", REG_EXPAND_SZ
"system32\\drivers\\viostor.sys";
+ "Owners", REG_MULTI_SZ [ oem1_inf ];
+ "Start", REG_DWORD 0x0_l;
+ "Tag", REG_DWORD 0x58_l;
+ "Type", REG_DWORD 0x1_l ];
+
+ [ current_cs; "Services"; "viostor"; "Parameters"
],
+ [ "BusType", REG_DWORD 0x1_l ];
+
+ [ current_cs; "Services"; "viostor"; "Parameters";
"PnpInterface" ],
+ [ "5", REG_DWORD 0x1_l ];
+
+ [ "DriverDatabase"; "DriverInfFiles"; oem1_inf ],
+ [ "", REG_MULTI_SZ [ viostor_inf ];
+ "Active", REG_SZ viostor_inf;
+ "Configurations", REG_MULTI_SZ [ "rhelscsi_inst" ]
+ ];
+
+ [ "DriverDatabase"; "DeviceIds"; "PCI";
"VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00" ],
+ [ oem1_inf, REG_BINARY "\x01\xff\x00\x00" ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf ],
+ [ "", REG_SZ oem1_inf;
+ "F6", REG_DWORD 0x1_l;
+ "InfName", REG_SZ "viostor.inf";
+ "OemPath", REG_SZ
("X:\\windows\\System32\\DriverStore\\FileRepository\\" ^ viostor_inf);
+ "Provider", REG_SZ "Red Hat, Inc.";
+ "SignerName", REG_SZ "Microsoft Windows Hardware Compatibility
Publisher";
+ "SignerScore", REG_DWORD 0x0d000005_l;
+ "StatusFlags", REG_DWORD 0x00000012_l;
+ (* NB: scsi_adapter_guid appears inside this string. *)
+ "Version", REG_BINARY
"\x00\xff\x09\x00\x00\x00\x00\x00\x7b\xe9\x36\x4d\x25\xe3\xce\x11\xbf\xc1\x08\x00\x2b\xe1\x03\x18\x00\x40\x90\xed\x87\x7f\xcf\x01\x98\x21\x68\x00\x47\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x00\x00"
];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst" ],
+ [ "ConfigFlags", REG_DWORD 0_l;
+ "Service", REG_SZ "viostor" ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Device" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Device"; "Interrupt
Management" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Device"; "Interrupt
Management"; "Affinity Policy" ],
+ [ "DevicePolicy", REG_DWORD 0x00000005_l ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Device"; "Interrupt
Management"; "MessageSignaledInterruptProperties" ],
+ [ "MSISupported", REG_DWORD 0x00000001_l;
+ "MessageNumberLimit", REG_DWORD 0x00000002_l ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Services" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Services";
"viostor" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Services";
"viostor"; "Parameters" ],
+ [ "BusType", REG_DWORD 0x00000001_l ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Configurations"; "rhelscsi_inst"; "Services";
"viostor"; "Parameters"; "PnpInterface" ],
+ [ "5", REG_DWORD 0x00000001_l ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Descriptors" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Descriptors"; "PCI" ],
+ [];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Descriptors"; "PCI";
"VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00" ],
+ [ "Configuration", REG_SZ "rhelscsi_inst";
+ "Description", REG_SZ "%rhelscsi.devicedesc%";
+ "Manufacturer", REG_SZ "%rhel%" ];
+
+ [ "DriverDatabase"; "DriverPackages"; viostor_inf;
"Strings" ],
+ [ "rhel", REG_SZ "Red Hat, Inc.";
+ "rhelscsi.devicedesc", REG_SZ "Red Hat VirtIO SCSI
controller" ];
+ ] in
+
+ reg_import g root regedits;
+
+ (*
+ A few more keys which we don't add above. Note that "oem1.inf" ==
+ 6f,00,65,00,6d,00,31,00,2e,00,69,00,6e,00,66,00.
+
+
[HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Enum\PCI\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\3&13c0b0c5&0&38\Properties\{540b947e-8b40-45bc-a8a2-6a0b894cbda2}\0007]
+
@=hex(ffff0012):6f,00,65,00,6d,00,31,00,2e,00,69,00,6e,00,66,00,3a,00,50,00,43,00,49,00,5c,00,56,00,45,00,4e,00,5f,00,31,00,41,00,46,00,34,00,26,00,44,00,45,00,56,00,5f,00,31,00,30,00,30,00,31,00,26,00,53,00,55,00,42,00,53,00,59,00,53,00,5f,00,30,00,30,00,30,00,32,00,31,00,41,00,46,00,34,00,26,00,52,00,45,00,56,00,5f,00,30,00,30,00,2c,00,72,00,68,00,65,00,6c,00,73,00,63,00,73,00,69,00,5f,00,69,00,6e,00,73,00,74,00,00,00
+
+
[HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Enum\PCI\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\3&13c0b0c5&0&38\Properties\{83da6326-97a6-4088-9453-a1923f573b29}\0003]
+
@=hex(ffff0012):6f,00,65,00,6d,00,31,00,2e,00,69,00,6e,00,66,00,3a,00,32,00,65,00,35,00,31,00,37,00,32,00,63,00,33,00,62,00,33,00,37,00,62,00,65,00,39,00,39,00,38,00,3a,00,72,00,68,00,65,00,6c,00,73,00,63,00,73,00,69,00,5f,00,69,00,6e,00,73,00,74,00,3a,00,36,00,32,00,2e,00,37,00,31,00,2e,00,31,00,30,00,34,00,2e,00,38,00,36,00,30,00,30,00,3a,00,50,00,43,00,49,00,5c,00,56,00,45,00,4e,00,5f,00,31,00,41,00,46,00,34,00,26,00,44,00,45,00,56,00,5f,00,31,00,30,00,30,00,31,00,26,00,53,00,55,00,42,00,53,00,59,00,53,00,5f,00,30,00,30,00,30,00,32,00,31,00,41,00,46,00,34,00,26,00,52,00,45,00,56,00,5f,00,30,00,30,00,00,00
+
+
[HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Enum\PCI\VEN_1AF4&DEV_1001&SUBSYS_00021AF4&REV_00\3&13c0b0c5&0&38\Properties\{a8b865dd-2e3d-4094-ad97-e593a70c75d6}\0005]
+ @=hex(ffff0012):6f,00,65,00,6d,00,31,00,2e,00,69,00,6e,00,66,00,00,00
+ *)
+
and update_software_hive root =
(* Update the SOFTWARE hive. When this function is called the
* hive has already been opened as a hivex handle inside
--
2.3.1
3440
days inactive
3440
days old
2 comments
1 participants
participants (1)
-
Richard W.M. Jones