[Qemu-devel] [PULL 0/2] Vga 20190111 patches

[Qemu-devel] [PULL 0/2] Vga 20190111 patches

[Gerd Hoffmann]

The following changes since commit a311f891abf3833c1e4c5a62a6e5b0f1b81f22c3:

  Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging (2019-01-10 17:49:54 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/vga-20190111-pull-request

for you to fetch changes up to b05b267840515730dbf6753495d5b7bd8b04ad1c:

  i2c-ddc: fix oob read (2019-01-11 11:45:00 +0100)

----------------------------------------------------------------
vga: enable virtio test, fix ddc oob read

----------------------------------------------------------------

Gerd Hoffmann (1):
  i2c-ddc: fix oob read

Thomas Huth (1):
  tests/display-vga: Enable virtio-vga test

 hw/i2c/i2c-ddc.c         |  2 +-
 tests/display-vga-test.c | 10 +++++-----
 tests/Makefile.include   |  5 +++++
 3 files changed, 11 insertions(+), 6 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/2] tests/display-vga: Enable virtio-vga test

[Gerd Hoffmann]

From: Thomas Huth <thuth@redhat.com>

There are some "#ifdef CONFIG_VIRTIO_VGA" in the code here which
do not work as expected: CONFIG_VIRTIO_VGA is a Makefile switch,
but not a CPP macro, so the "guarded" code currently simply never
gets enabled.

So enable this code now unconditionally, with some runtime switches
for the architectures that have the VIRTIO_VGA device enabled by
default. Looking at the other if-statement in the main function here,
it also seems like this test was originally supposed to be running
on "mips" and "alpha", too, so enable it now for these architectures
in the Makefile, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1543492248-28356-1-git-send-email-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/display-vga-test.c | 10 +++++-----
 tests/Makefile.include   |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/display-vga-test.c b/tests/display-vga-test.c
index 2d7d24eee0..bd176dcf3a 100644
--- a/tests/display-vga-test.c
+++ b/tests/display-vga-test.c
@@ -40,13 +40,11 @@ static void pci_virtio_gpu(void)
     qtest_end();
 }
 
-#ifdef CONFIG_VIRTIO_VGA
 static void pci_virtio_vga(void)
 {
     qtest_start("-vga none -device virtio-vga");
     qtest_end();
 }
-#endif
 
 int main(int argc, char **argv)
 {
@@ -62,8 +60,10 @@ int main(int argc, char **argv)
     qtest_add_func("/display/pci/secondary", pci_secondary);
     qtest_add_func("/display/pci/multihead", pci_multihead);
     qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu);
-#ifdef CONFIG_VIRTIO_VGA
-    qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
-#endif
+    if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64") ||
+        g_str_equal(arch, "hppa") || g_str_equal(arch, "ppc64")) {
+        qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
+    }
+
     return g_test_run();
 }
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9c84bbd829..a4e59eeb37 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -222,18 +222,23 @@ check-qtest-x86_64-y += $(check-qtest-i386-y)
 check-qtest-x86_64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
 
 check-qtest-alpha-y += tests/boot-serial-test$(EXESUF)
+check-qtest-alpha-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 
 check-qtest-hppa-y += tests/boot-serial-test$(EXESUF)
+check-qtest-hppa-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 
 check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
 
 check-qtest-microblaze-y += tests/boot-serial-test$(EXESUF)
 
 check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
+check-qtest-mips-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 
 check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
+check-qtest-mips64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 
 check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
+check-qtest-mips64el-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 
 check-qtest-moxie-y += tests/boot-serial-test$(EXESUF)
 
-- 
2.9.3

[Qemu-devel] [PULL 2/2] i2c-ddc: fix oob read

[Gerd Hoffmann]

Suggested-by: Michael Hanselmann <public@hansmi.ch>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael Hanselmann <public@hansmi.ch>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190108102301.1957-1-kraxel@redhat.com
---
 hw/i2c/i2c-ddc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c
index be34fe072c..0a0367ff38 100644
--- a/hw/i2c/i2c-ddc.c
+++ b/hw/i2c/i2c-ddc.c
@@ -56,7 +56,7 @@ static int i2c_ddc_rx(I2CSlave *i2c)
     I2CDDCState *s = I2CDDC(i2c);
 
     int value;
-    value = s->edid_blob[s->reg];
+    value = s->edid_blob[s->reg % sizeof(s->edid_blob)];
     s->reg++;
     return value;
 }
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Vga 20190111 patches

[Peter Maydell]

On Fri, 11 Jan 2019 at 14:00, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit a311f891abf3833c1e4c5a62a6e5b0f1b81f22c3:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging (2019-01-10 17:49:54 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20190111-pull-request
>
> for you to fetch changes up to b05b267840515730dbf6753495d5b7bd8b04ad1c:
>
>   i2c-ddc: fix oob read (2019-01-11 11:45:00 +0100)
>
> ----------------------------------------------------------------
> vga: enable virtio test, fix ddc oob read
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   i2c-ddc: fix oob read
>
> Thomas Huth (1):
>   tests/display-vga: Enable virtio-vga test
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM