cd77acc433
Add pending upstream patches (v2) for 1961107. resolves: rhbz#2011713 -- Original commit messages: prepare dist-git branch for rebase to 1.45.91 by Laszlo Signed-off-by: Laszlo Ersek <lersek@redhat.com> Take some spec file mods from "Virt-v2v 2.0 modular test 9." by Rich Origin: Message-Id: <20211114151337.880321-1-rjones@redhat.com>. Signed-off-by: Laszlo Ersek <lersek@redhat.com> refresh patch list, %changelog, Release, for 1.45.91 + RHBZ#1961107 v2 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From ebd756f60017f6618045fc524fc16422d649a77e Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Fri, 12 Nov 2021 13:34:34 +0100
|
|
Subject: [PATCH] output: handle Standard_VGA in the OpenStack format
|
|
|
|
Convert the Standard_VGA value of "guestcaps.gcaps_video" to the string
|
|
"vga", in the OpenStack image properties.
|
|
|
|
Reference:
|
|
https://docs.openstack.org/glance/xena/admin/useful-image-properties.html
|
|
|
|
Cc: Kashyap Chamarthy <kchamart@redhat.com>
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com>
|
|
---
|
|
output/openstack_image_properties.ml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml
|
|
index 72f3e9d9261d..9d466ecfbf0f 100644
|
|
--- a/output/openstack_image_properties.ml
|
|
+++ b/output/openstack_image_properties.ml
|
|
@@ -43,7 +43,7 @@ let create source inspect { target_buses; guestcaps; target_firmware } =
|
|
| RTL8139 -> "rtl8139");
|
|
"hw_video_model",
|
|
(match guestcaps.gcaps_video with
|
|
- | Standard_VGA -> assert false
|
|
+ | Standard_VGA -> "vga"
|
|
| QXL -> "qxl"
|
|
| Cirrus -> "cirrus");
|
|
"hw_machine_type",
|
|
--
|
|
2.19.1.3.g30247aa5d201
|
|
|