Fix rtl8139-test

Patch sent upstream 2023-02-27.

0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch

@@ -1,7 +1,7 @@
 From e54512fe75f85640c0c73e53e6f8bd0b9d193529 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Tue, 1 Feb 2022 20:09:37 +0100
-Subject: [PATCH 1/6] target/i386: the sgx_epc_get_section stub is reachable
+Subject: [PATCH 1/7] target/i386: the sgx_epc_get_section stub is reachable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0002-tests-Disable-pci_virtio_vga-for-ppc64.patch

@@ -1,7 +1,7 @@
 From 2f0a0afbf915d36c39c5cfac1e31c6edc7f47bef Mon Sep 17 00:00:00 2001
 From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
 Date: Thu, 1 Sep 2022 12:43:49 -0300
-Subject: [PATCH 2/6] tests: Disable pci_virtio_vga for ppc64
+Subject: [PATCH 2/7] tests: Disable pci_virtio_vga for ppc64
 
 starting QEMU: exec ./qemu-system-ppc64 -qtest unix:/tmp/qtest-2378197.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-2378197.qmp,id=char0 -mon chardev=char0,mode=control -display none -vga none -device virtio-vga -accel qtest
 stderr:

0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch

@@ -1,7 +1,7 @@
 From 5c1d2f920c14d6e8f4ac7abc62714eadaa60f228 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Tue, 10 Jan 2023 12:37:14 -0500
-Subject: [PATCH 3/6] Revert "linux-user: add more compat ioctl definitions"
+Subject: [PATCH 3/7] Revert "linux-user: add more compat ioctl definitions"
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch

@@ -1,7 +1,7 @@
 From b40cf0a490c28d5b79e05382d061983b92a7b2b3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Tue, 10 Jan 2023 12:37:25 -0500
-Subject: [PATCH 4/6] Revert "linux-user: fix compat with glibc >= 2.36
+Subject: [PATCH 4/7] Revert "linux-user: fix compat with glibc >= 2.36
  sys/mount.h"
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch

@@ -1,7 +1,7 @@
 From db788c896eb1378ebc1f20dcc4954616a7631919 Mon Sep 17 00:00:00 2001
 From: Stefan Hajnoczi <stefanha@redhat.com>
 Date: Tue, 7 Feb 2023 15:37:16 -0500
-Subject: [PATCH 5/6] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF
+Subject: [PATCH 5/7] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF
 
 When a write request is converted into a write zeroes request by the
 detect-zeroes= feature, it is no longer associated with an I/O buffer.

0006-PATCH-test-vmstate-fix-bad-GTree-usage-use-after-fre.patch

@@ -1,7 +1,7 @@
 From 930def8769940600dd7dd587ec2accd4a8b6e1f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
 Date: Mon, 27 Feb 2023 16:02:51 +0000
-Subject: [PATCH 6/6] [PATCH] test-vmstate: fix bad GTree usage, use-after-free
+Subject: [PATCH 6/7] [PATCH] test-vmstate: fix bad GTree usage, use-after-free
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0007-tests-Ensure-TAP-version-is-printed-before-other-mes.patch

@@ -0,0 +1,42 @@
+From 4021e0a116b568c312b864dfc27dfeed3317538a Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Feb 2023 17:37:10 +0000
+Subject: [PATCH 7/7] tests: Ensure TAP version is printed before other
+ messages
+
+These two tests were failing with this error:
+
+  stderr:
+  TAP parsing error: version number must be on the first line
+  [...]
+  Unknown TAP version. The first line MUST be `TAP version <int>`. Assuming version 12.
+
+This can be fixed by ensuring we always call g_test_init first in the
+body of main.
+
+Thanks: Daniel Berrange, for diagnosing the problem
+Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
+---
+ tests/qtest/rtl8139-test.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
+index 8fa3313cc3..90bb616974 100644
+--- a/tests/qtest/rtl8139-test.c
++++ b/tests/qtest/rtl8139-test.c
+@@ -196,9 +196,10 @@ int main(int argc, char **argv)
+ {
+     int ret;
+ 
+-    qtest_start("-device rtl8139");
+-
+     g_test_init(&argc, &argv, NULL);
++
++    qtest_start("-device rtl8139");
++
+     qtest_add_func("/rtl8139/nop", nop);
+     qtest_add_func("/rtl8139/timer", test_init);
+ 
+-- 
+2.37.3
+

qemu.spec

@@ -357,6 +357,8 @@ Patch: 0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch
 # https://gitlab.com/qemu-project/qemu/-/issues/1518
 # Patch is NOT UPSTREAM.
 Patch: 0006-PATCH-test-vmstate-fix-bad-GTree-usage-use-after-fre.patch
+# Fix one of the tests.  Sent upstream 2023-02-27.
+Patch: 0007-tests-Ensure-TAP-version-is-printed-before-other-mes.patch
 
 BuildRequires: meson >= %{meson_version}
 BuildRequires: zlib-devel