Set QEMUVGA back to qxl for x86_64, unset it for aarch64

qemu 2.11.2 fixes #1403343, so we can go back to using qxl for
x86_64 VMs. Also, setting QEMUVGA doesn't actually do anything
on aarch64 (os-autoinst ignores it and sets up virtio graphics
instead), so let's not set it to avoid confusion.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-07-12 14:49:42 -07:00
parent 9ae2c249f2
commit 7ba5dfcc94

View File

@ -4156,7 +4156,7 @@
settings => [ settings => [
{ key => "QEMUCPU", value => "Nehalem" }, { key => "QEMUCPU", value => "Nehalem" },
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUVGA", value => "std"}, { key => "QEMUVGA", value => "qxl"},
{ key => "QEMURAM", value => "2048"}, { key => "QEMURAM", value => "2048"},
{ key => "PART_TABLE_TYPE", value => "mbr"}, { key => "PART_TABLE_TYPE", value => "mbr"},
{ key => "WORKER_CLASS", value => "qemu_x86_64" }, { key => "WORKER_CLASS", value => "qemu_x86_64" },
@ -4169,7 +4169,7 @@
settings => [ settings => [
{ key => "QEMUCPU", value => "Nehalem" }, { key => "QEMUCPU", value => "Nehalem" },
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUVGA", value => "std"}, { key => "QEMUVGA", value => "qxl"},
{ key => "QEMURAM", value => "2048"}, { key => "QEMURAM", value => "2048"},
{ key => "UEFI", value => "1"}, { key => "UEFI", value => "1"},
{ key => "PART_TABLE_TYPE", value => "gpt"}, { key => "PART_TABLE_TYPE", value => "gpt"},
@ -4230,7 +4230,6 @@
{ key => "QEMU", value => "aarch64" }, { key => "QEMU", value => "aarch64" },
{ key => "QEMUCPUS", value => "2"}, { key => "QEMUCPUS", value => "2"},
{ key => "QEMUMACHINE", value => "virt"}, { key => "QEMUMACHINE", value => "virt"},
{ key => "QEMUVGA", value => "std" },
{ key => "QEMURAM", value => 3072 }, { key => "QEMURAM", value => 3072 },
{ key => "QEMUCPU", value => "host" }, { key => "QEMUCPU", value => "host" },
{ key => "TIMEOUT_SCALE", value => "1.5" }, { key => "TIMEOUT_SCALE", value => "1.5" },