cryptospore / rpms / qemu-kvm

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