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