Sandro Bonazzola has uploaded a new change for review.

Change subject: packaging: engine-setup - add support for virtio-win >= 1.6.3
......................................................................

packaging: engine-setup - add support for virtio-win >= 1.6.3

virtio-win 1.6.3 reorganized the VFDs to be 32/64 bit.
Added support for virtio-win >= 1.6.3 keeping the compatibility
with the older versions.

Change-Id: Ie2a538dd327bdd692acdc4e7324bd39890e5dccb
Bug-Url: https://bugzilla.redhat.com/919204
Signed-off-by: Sandro Bonazzola <[email protected]>
---
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-setup.py
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/12876/1

diff --git a/packaging/fedora/setup/basedefs.py 
b/packaging/fedora/setup/basedefs.py
index 0719fc4..4ad13db 100644
--- a/packaging/fedora/setup/basedefs.py
+++ b/packaging/fedora/setup/basedefs.py
@@ -124,7 +124,10 @@
 
 # ISO FILES
 FILE_VIRTIO_WIN_VFD="/usr/share/virtio-win/virtio-win.vfd"
+FILE_VIRTIO_WIN_X86_VFD="/usr/share/virtio-win/virtio-win_x86.vfd"
+FILE_VIRTIO_WIN_AMD64_VFD="/usr/share/virtio-win/virtio-win_amd64.vfd"
 FILE_VIRTIO_WIN_ISO="/usr/share/virtio-win/virtio-win.iso"
+
 
FILE_RHEV_GUEST_TOOLS_ISO="/usr/share/rhev-guest-tools-iso/rhev-tools-setup.iso"
 
 #Locations of kernel configuration files
diff --git a/packaging/fedora/setup/engine-setup.py 
b/packaging/fedora/setup/engine-setup.py
index b77caac..92ff552 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -1881,7 +1881,13 @@
     to the configured nfs shared domain
     """
     #TODO: add more iso files in the future
-    fileList = [basedefs.FILE_VIRTIO_WIN_VFD, basedefs.FILE_VIRTIO_WIN_ISO, 
basedefs.FILE_RHEV_GUEST_TOOLS_ISO]
+    fileList = [
+        basedefs.FILE_VIRTIO_WIN_VFD,
+        basedefs.FILE_VIRTIO_WIN_X86_VFD,
+        basedefs.FILE_VIRTIO_WIN_AMD64_VFD,
+        basedefs.FILE_VIRTIO_WIN_ISO,
+        basedefs.FILE_RHEV_GUEST_TOOLS_ISO
+    ]
 
     # Prepare the full path for the iso files
     targetPath = os.path.join(controller.CONF["NFS_MP"], 
controller.CONF["sd_uuid"], "images", "11111111-1111-1111-1111-111111111111")


--
To view, visit http://gerrit.ovirt.org/12876
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2a538dd327bdd692acdc4e7324bd39890e5dccb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to