Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -2,3 +2,4 @@
 /x86_64/
 /*.src.rpm
 /qemu-*.tar.xz
+/qemu-*.tar.xz.sig

.rpmlintrc

@@ -0,0 +1,6 @@
+# Using _sourcedir makes the spec much more readable IMO.
+# The Fedora wiki complaint is pretty obscure too.
+addFilter(r'use-of-RPM_SOURCE_DIR')
+
+# This is a virtual Provides: that should not contain any version info
+addFilter(r'unversioned-explicit-provides vhostuser-backend\(fs\)')

0001-include-ui-rect.h-fix-qemu_rect_init-mis-assignment.patch

@@ -0,0 +1,36 @@
+From 9d5b42beb6978dc6219d5dc029c9d453c6b8d503 Mon Sep 17 00:00:00 2001
+From: Elen Avan <elen.avan@bk.ru>
+Date: Fri, 22 Dec 2023 22:17:21 +0300
+Subject: [PATCH] include/ui/rect.h: fix qemu_rect_init() mis-assignment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Elen Avan <elen.avan@bk.ru>
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2051
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2050
+Fixes: a200d53b1fde "virtio-gpu: replace PIXMAN for region/rect test"
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
+---
+ include/ui/rect.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/ui/rect.h b/include/ui/rect.h
+index 94898f92d0..68f05d78a8 100644
+--- a/include/ui/rect.h
++++ b/include/ui/rect.h
+@@ -19,7 +19,7 @@ static inline void qemu_rect_init(QemuRect *rect,
+                                   uint16_t width, uint16_t height)
+ {
+     rect->x = x;
+-    rect->y = x;
++    rect->y = y;
+     rect->width = width;
+     rect->height = height;
+ }
+-- 
+2.43.0
+

0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch

@@ -0,0 +1,35 @@
+From 98287d67f3ea6c49795838beda4b020cf236fc20 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 27 Nov 2023 12:51:25 -0500
+Subject: [PATCH] pc-bios/optionrom: Fix pvh.img ld build failure on fedora
+ rawhide
+Content-type: text/plain
+
+binutils 2.39 shows some warnings when building pvh.img
+
+/usr/bin/ld: warning: pvh.o: missing .note.GNU-stack section implies executable stack
+/usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+/usr/bin/ld: warning: pvh.img has a LOAD segment with RWX permissions
+
+The latter of which is fatal on Fedora rawhide for some reason.
+
+Add linker options to suppress the errors
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ pc-bios/optionrom/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
+index 30d07026c7..f54ed39b54 100644
+--- a/pc-bios/optionrom/Makefile
++++ b/pc-bios/optionrom/Makefile
+@@ -36,7 +36,7 @@ config-cc.mak: Makefile
+ 	    $(call cc-option,-Wno-array-bounds)) 3> config-cc.mak
+ -include config-cc.mak
+ 
+-override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds
++override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds -Wl,--no-warn-rwx-segments -Wl,--no-warn-execstack
+ 
+ pvh.img: pvh.o pvh_main.o
+ 

99-qemu-guest-agent.rules

@@ -1,2 +1,2 @@
 SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
-  TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
+  TAG+="systemd", ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"

README.tests

@@ -0,0 +1,39 @@
+qemu-kvm-tests README
+=====================
+
+The qemu-kvm-tests rpm contains tests that can be used to verify the
+functionality of the installed qemu-kvm package
+
+When installed, the files from this rpm will be arranged in the following
+directory structure
+
+tests-src/
+├── README
+├── scripts
+│   ├── qemu.py
+│   └── qmp
+└── tests
+    ├── acceptance
+    ├── Makefile.include
+    └── qemu-iotests
+
+The tests/ directory within the tests-src/ directory is setup to remain a copy
+of a subset of the tests/ directory from the QEMU source tree
+
+The avocado_qemu tests and qemu-iotests, along with files required for the
+execution of the avocado_qemu tests (scripts/qemu.py and scripts/qmp/) will be
+installed in a new location - /usr/lib64/qemu-kvm/tests-src/
+
+avocado_qemu tests:
+The avocado_qemu tests can be executed by running the following avocado command:
+avocado run -p qemu_bin=/usr/libexec/qemu-kvm /usr/lib64/qemu-kvm/tests/acceptance/
+Avocado needs to be installed separately using either pip or from source as
+Avocado is not being packaged for RHEL-8.
+
+qemu-iotests:
+symlinks to corresponding binaries need to be created for QEMU_PROG,
+QEMU_IO_PROG, QEMU_IMG_PROG, and QEMU_NBD_PROG before the iotests can be
+executed.
+
+The primary purpose of this package is to make these tests available to be
+executed as gating tests for the virt module in the RHEL-8 OSCI environment.

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

kvm-s390x.conf

@@ -0,0 +1,19 @@
+# User changes in this file are preserved across upgrades.
+#
+# Setting "modprobe kvm nested=1" only enables Nested Virtualization until
+# the next reboot or module reload. Uncomment the option below to enable
+# the feature permanently.
+#
+#options kvm nested=1
+#
+#
+# Setting "modprobe kvm hpage=1" only enables Huge Page Backing (1MB)
+# support until the next reboot or module reload. Uncomment the option
+# below to enable the feature permanently.
+#
+# Note: - Incompatible with "nested=1". Loading the module will fail.
+#       - Dirty page logging will be performed on a 1MB (not 4KB) basis,
+#         which can result in a lot of data having to be transferred during
+#         migration, and therefore taking very long to converge.
+#
+#options kvm hpage=1

kvm-x86.conf

@@ -0,0 +1,12 @@
+# Setting modprobe kvm_intel/kvm_amd nested = 1
+# only enables Nested Virtualization until the next reboot or
+# module reload. Uncomment the option applicable
+# to your system below to enable the feature permanently.
+#
+# User changes in this file are preserved across upgrades.
+#
+# For Intel
+#options kvm_intel nested=1
+#
+# For AMD
+#options kvm_amd nested=1

kvm-x86.modprobe.conf

@@ -1,11 +0,0 @@
-###
-### This configuration file was provided by the qemu package.
-### Feel free to update as needed.
-###
-
-###
-### Set these options to enable nested virtualization
-###
-
-#options kvm_intel nested=1
-#options kvm_amd nested=1

kvm.conf

@@ -0,0 +1,3 @@
+#
+# User changes in this file are preserved across upgrades.
+#

plans/main.fmf

@@ -0,0 +1,8 @@
+# toplevel plan boilerplate
+summary: qemu tests
+description:
+    Test qemu
+discover:
+    how: fmf
+execute:
+    how: tmt

qemu-kvm.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Libvirt introspects the binary using -M none. In that case, don't try
-# to init KVM, which will fail and be noisy if the host has kvm disabled
-opts="-machine accel=kvm"
-if echo "$@" | grep -q " -M none "; then
-    opts=
-fi
-
-exec /usr/bin/qemu-system-x86_64 $opts "$@"

rpminspect.yaml

@@ -0,0 +1,20 @@
+# complains about qemu use of: gethostbyname, inet_aton, inet_ntoa
+# but warning here isn't really accomplishing anything
+badfuncs:
+  exclude_path: .*
+
+# These pre-compiled files have `.symtab`
+debuginfo:
+  ignore:
+    - /usr/share/qemu/palcode-clipper
+    - /usr/share/qemu/hppa-firmware.img
+
+# More pre-compiled rom warnings:
+# - Program built without GNU_STACK: /usr/share/qemu/u-boot.e500
+# - Stack is still executable: /usr/share/qemu/hppa-firmware.img
+elf:
+  exclude_path: ^/usr/share/qemu/(u-boot.e500|hppa-firmware.img)$
+
+# CryptoPkg fuzz tests have invalid unicode, but I assume that's intentional
+unicode:
+  exclude: .*edk2/CryptoPkg.*

sources

@@ -1 +1,2 @@
-SHA512 (qemu-5.2.0-rc4.tar.xz) = 47e918392609c34f904962e5759125485407ae52c273053729054300e10fc67fc7ed443c9af25d1d852a5f5c70eee125c703ce15d0e571068848f405de33db3b
+SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
+SHA512 (qemu-8.2.0.tar.xz.sig) = 05412219ab0ff145f56708f99bc60b378b2b9ef6fbf3c48bffd32a2952188b2ee34a798949b09d6d8fc9f2483094fa0e3b488f52f69508604747ad4e2960f302

tests/main.fmf

@@ -0,0 +1,20 @@
+# This is 'tmt' config format
+# https://tmt.readthedocs.io/en/stable/spec.html
+
+summary: Runtime test qemu
+
+require:
+    - qemu
+    - qemu-sanity-check
+
+/smoke:
+    # Make sure -help doesn't fail
+    test: |
+        set -eux
+        qemu-system-x86_64 -help
+        qemu-img -help
+
+/qemu-sanity-check:
+    test: |
+        set -eux
+        qemu-sanity-check -v

vhost.conf

@@ -0,0 +1,3 @@
+# Increase default vhost memory map limit to match
+# KVM's memory slot limit
+options vhost max_mem_regions=509