|
 |
9ae3a8 |
From e73cf28a72a02ce4f56471829a97c70dc4831a84 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 31 Jul 2013 08:04:20 +0200
|
|
|
9ae3a8 |
Subject: qxl: set revision to 1 for rhel6.0.0
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1375201922-6794-9-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 52818
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 PATCH v3 08/15] qxl: set revision to 1 for rhel6.0.0
|
|
|
9ae3a8 |
Bugzilla: 983991
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
bugzilla: #893344 - info qtree mismatch
|
|
|
9ae3a8 |
upstream: No (rhel6.0.0 spice code base predates upstream merge,
|
|
|
9ae3a8 |
so this compat property isn't relevant there).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 69f07de9ed3678198578fe036da202cbbca3f312)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflicts:
|
|
|
9ae3a8 |
hw/pc.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Picked from qemu-kvm-rhel6.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index 9e96b79..57877e3 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -870,11 +870,11 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
.driver = "qxl",\
|
|
|
9ae3a8 |
.property = "revision",\
|
|
|
9ae3a8 |
- .value = stringify(3),\
|
|
|
9ae3a8 |
+ .value = stringify(1),\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
.driver = "qxl-vga",\
|
|
|
9ae3a8 |
.property = "revision",\
|
|
|
9ae3a8 |
- .value = stringify(3),\
|
|
|
9ae3a8 |
+ .value = stringify(1),\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
.driver = "VGA",\
|
|
|
9ae3a8 |
.property = "mmio",\
|