Compare commits
276 Commits
master
...
main-riscv
Author | SHA1 | Date | |
---|---|---|---|
a14240ea24 | |||
d04c3fa847 | |||
0da62d9e52 | |||
|
4ed5b3f7e5 | ||
|
8f713f34c7 | ||
|
2ec48f070b | ||
|
2bc7bc3ddf | ||
|
f98adcd28f | ||
|
12457ec1dd | ||
|
737c06be4b | ||
|
aa1afc9325 | ||
|
76e732d877 | ||
|
8d2563a60d | ||
|
17714de22e | ||
|
e116d46171 | ||
|
0cab459137 | ||
|
9022fd9a02 | ||
|
7f792a550a | ||
|
f445a1d1df | ||
|
58957c219b | ||
|
8546176074 | ||
a973413f12 | |||
300c04fb9b | |||
00242a13a5 | |||
|
2d716294f1 | ||
|
5fde0b1627 | ||
|
6ca1975319 | ||
|
62fec653e4 | ||
|
ed3c308c72 | ||
|
19dabf8013 | ||
|
05f289c3f3 | ||
|
a2578065ff | ||
|
5206b67dbc | ||
|
e46b6fe585 | ||
|
971e984a4c | ||
|
5c2ab5c259 | ||
|
d5321c6ac0 | ||
08e997de9a | |||
|
fd6b74bccc | ||
|
d364afeef7 | ||
|
bd268d19cc | ||
|
fa9ecd2d1f | ||
|
7d58afccfc | ||
|
04c52c7c18 | ||
|
5dc33a7885 | ||
|
1bd1d083f3 | ||
|
3ab71e3cfb | ||
|
affe1791b7 | ||
|
cf84426a04 | ||
|
6b4bb5d4e2 | ||
|
2601a942ca | ||
|
be157516d8 | ||
|
409fcdb379 | ||
|
d67c7eef5f | ||
|
94ac31f9f7 | ||
|
c8c91351c0 | ||
|
93330a974c | ||
|
865331f395 | ||
|
9344a1bc56 | ||
|
60857dcd6f | ||
|
b7ea007094 | ||
1d003b9d3d | |||
|
22512f545b | ||
|
cb4378cf14 | ||
|
e1b58db1d6 | ||
|
1c471d38bc | ||
|
da8e31c4fc | ||
|
c29054addb | ||
|
d047f99265 | ||
|
a93659c041 | ||
|
deeb9357cb | ||
|
2818b991c3 | ||
|
e5cb9532c0 | ||
|
9e1191cbbc | ||
|
63c8857a93 | ||
|
595e23bfb7 | ||
|
547a9bc5ba | ||
|
db8d68a5f9 | ||
|
2f2f662015 | ||
|
5c6b4486a8 | ||
|
9a96ecbb25 | ||
|
43be60cdc4 | ||
|
7be0fd4310 | ||
71f792f01c | |||
05c11e868d | |||
|
e4bc25c09b | ||
|
f51053d48a | ||
|
98762f53f6 | ||
|
1ece14f33e | ||
|
28fd87d26a | ||
|
f36b5bbd6f | ||
|
9d0cc42919 | ||
|
66ae407ce2 | ||
|
9ce3d1e3ca | ||
|
9bdf4d356a | ||
|
fe9446c8aa | ||
|
44034e55c1 | ||
|
bc72c799c7 | ||
|
2ce5ca73a8 | ||
|
f53d48ae75 | ||
|
ef665a7199 | ||
|
9061c9345e | ||
|
589d3530fb | ||
|
cef9ee51c5 | ||
|
f2cb56a43c | ||
|
2b6515981a | ||
|
f3752caa84 | ||
|
493beb6043 | ||
|
27bca4038c | ||
|
d58272f92e | ||
|
b5541eb631 | ||
|
bd635cd85e | ||
|
0ef68abd71 | ||
|
f48e9e218c | ||
|
d8ea841ee8 | ||
|
fb1517ca3f | ||
|
650c8272f6 | ||
|
8d94f851ec | ||
|
4eb8ef11c1 | ||
|
8f629c7e0f | ||
|
3f79a68361 | ||
|
fcf47181da | ||
|
c59732e734 | ||
|
b47d99db35 | ||
|
6a1d35e912 | ||
|
3ce4eaa6a2 | ||
|
d09d3961a3 | ||
|
7539983f1e | ||
|
92a87311fd | ||
|
795912844a | ||
|
bd46f9571e | ||
|
64fe772650 | ||
|
055837f300 | ||
|
2874d70b6b | ||
|
34254733fe | ||
|
0eeaeaae15 | ||
|
2abd5d20f1 | ||
|
98276b3e5f | ||
|
22305b524e | ||
57a0fd859a | |||
a72423248e | |||
fd87d7e805 | |||
122e9d3bd7 | |||
|
9fda121878 | ||
|
72c46205a7 | ||
|
18240b2c2d | ||
|
c6215ce146 | ||
|
0d9e001957 | ||
|
e84a043f40 | ||
|
cb880e77f3 | ||
|
8d6927e8da | ||
|
467b991168 | ||
|
a3d41732e4 | ||
|
9439665b5a | ||
|
870630749a | ||
|
a575c5e346 | ||
|
01af37d608 | ||
|
230e4a2b0a | ||
|
ef9df8de89 | ||
|
a686537d26 | ||
|
4e789f984b | ||
|
8825298cc2 | ||
|
d8c4df3d29 | ||
|
0007b37337 | ||
|
af7430aef5 | ||
|
fdc9ebb862 | ||
|
148536a5a4 | ||
|
3f428d8457 | ||
|
82e1f8635e | ||
|
41fa2b0e3c | ||
|
c8164e8043 | ||
|
5b1d8f6b37 | ||
|
06a96ef6dd | ||
|
f38131b637 | ||
|
ffa629f31c | ||
|
6dc1a3e091 | ||
|
a640e151b2 | ||
|
2d6f694dd7 | ||
|
842e805475 | ||
|
f54452a157 | ||
|
f9f5de9994 | ||
|
69b8f67c7d | ||
|
eedf91107a | ||
|
1609e9b0cd | ||
|
b34716a4e7 | ||
|
59b417a5f3 | ||
|
9182556bd5 | ||
|
7be05bc02d | ||
|
1d93f5191e | ||
|
65ccb9e09a | ||
|
c5273992ba | ||
|
c1a37784f9 | ||
|
9eb1916f15 | ||
|
1ba242c778 | ||
|
96944e0b05 | ||
|
050829c2b7 | ||
|
79f4b0ef32 | ||
|
a06059bd4d | ||
|
7403595754 | ||
|
bf8d867e21 | ||
|
51980a6acd | ||
|
b048de05e7 | ||
|
6bb4bb52c7 | ||
|
f744b8b952 | ||
|
f806e664d9 | ||
|
38b1a6c732 | ||
|
b7cbd7e5e1 | ||
|
e3c05f4d3e | ||
|
1ac11e4877 | ||
|
2dc6f7395e | ||
|
0edf0fe9c8 | ||
|
e5d06dbc16 | ||
|
2825584364 | ||
|
6af1856936 | ||
|
d6b4a46932 | ||
|
ba7d6c0e41 | ||
|
7ae7935089 | ||
|
e1bf97d468 | ||
|
51821d35c5 | ||
|
180e0d8daf | ||
|
e0cb84627a | ||
|
f1ea3b69f7 | ||
|
d13afbee6a | ||
|
b013f94648 | ||
|
d5c2bbe293 | ||
|
05fedb21f6 | ||
|
0ae9d20128 | ||
|
183fcd911e | ||
|
e6c8eaee02 | ||
|
d4c8ff71ce | ||
|
f4c1719ae1 | ||
|
73149263f3 | ||
|
b2595a5449 | ||
|
d636452cba | ||
|
4a2d9a4c52 | ||
|
f54ac0f7d7 | ||
|
833342c627 | ||
|
ad860648fa | ||
|
91b70a682d | ||
|
4abd8de197 | ||
|
566be371a3 | ||
|
7a925b3802 | ||
|
443b083edd | ||
|
ec76e0bb54 | ||
|
ec4dab0a93 | ||
|
7e8e4ff4c0 | ||
|
6c55704061 | ||
|
09badc27ce | ||
|
1081205b84 | ||
|
658feedf3f | ||
|
5c8060d1bd | ||
|
9348aa0ea4 | ||
|
1ba19df591 | ||
|
d9c8b54b44 | ||
|
169bee2e2a | ||
|
610d93e5b9 | ||
|
66fde773e9 | ||
|
7e7be1c025 | ||
|
47a69fd3ce | ||
|
c0b65475ef | ||
|
ac27562f19 | ||
|
dcfe42be8d | ||
|
ba23d039c8 | ||
|
c7533d29df | ||
|
0ff75312ab | ||
|
8b5ba7c256 | ||
|
c996909a49 | ||
|
d1c4548bc8 | ||
|
74370c64ef | ||
|
130b985a3c | ||
|
fac3f007a0 | ||
|
1abc8e9bf0 | ||
|
a3063707fe | ||
|
18c8d565ff | ||
|
5a84bef82e | ||
|
d283ab8f84 |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/x86_64/
|
||||
/*.src.rpm
|
||||
/qemu-*.tar.xz
|
||||
/qemu-*.tar.xz.sig
|
||||
|
6
.rpmlintrc
Normal file
6
.rpmlintrc
Normal file
@ -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\)')
|
36
0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch
Normal file
36
0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 63d3792ebe5202121526d5a2077eb42e16f53b79 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Mon, 26 Aug 2024 14:06:14 -0400
|
||||
Subject: [PATCH] Disable 9p `local` tests that fail on copr aarch64
|
||||
|
||||
Upstream issue:
|
||||
https://gitlab.com/qemu-project/qemu/-/issues/2541
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/qtest/virtio-9p-test.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
|
||||
index ab3a12c816..261b0c17f1 100644
|
||||
--- a/tests/qtest/virtio-9p-test.c
|
||||
+++ b/tests/qtest/virtio-9p-test.c
|
||||
@@ -792,6 +792,7 @@ static void register_virtio_9p_test(void)
|
||||
/* 9pfs test cases using the 'local' filesystem driver */
|
||||
opts.before = assign_9p_local_driver;
|
||||
qos_add_test("local/config", "virtio-9p", pci_config, &opts);
|
||||
+#if 0
|
||||
qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);
|
||||
qos_add_test("local/unlinkat_dir", "virtio-9p", fs_unlinkat_dir, &opts);
|
||||
qos_add_test("local/create_file", "virtio-9p", fs_create_file, &opts);
|
||||
@@ -804,6 +805,7 @@ static void register_virtio_9p_test(void)
|
||||
&opts);
|
||||
qos_add_test("local/use_after_unlink", "virtio-9p", fs_use_after_unlink,
|
||||
&opts);
|
||||
+#endif
|
||||
}
|
||||
|
||||
libqos_init(register_virtio_9p_test);
|
||||
--
|
||||
2.46.0
|
||||
|
@ -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"
|
||||
|
39
README.tests
Normal file
39
README.tests
Normal file
@ -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.
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -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}
|
BIN
gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg
Normal file
BIN
gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg
Normal file
Binary file not shown.
19
kvm-s390x.conf
Normal file
19
kvm-s390x.conf
Normal file
@ -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
|
12
kvm-x86.conf
Normal file
12
kvm-x86.conf
Normal file
@ -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
|
@ -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
|
3
kvm.conf
Normal file
3
kvm.conf
Normal file
@ -0,0 +1,3 @@
|
||||
#
|
||||
# User changes in this file are preserved across upgrades.
|
||||
#
|
8
plans/main.fmf
Normal file
8
plans/main.fmf
Normal file
@ -0,0 +1,8 @@
|
||||
# toplevel plan boilerplate
|
||||
summary: qemu tests
|
||||
description:
|
||||
Test qemu
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
@ -1,11 +1,12 @@
|
||||
# This is a systemd environment file, not a shell script.
|
||||
# It provides settings for "/lib/systemd/system/qemu-guest-agent.service".
|
||||
|
||||
# Comma-separated blacklist of RPCs to disable, or empty list to enable all.
|
||||
# Extra arguments to pass to the guest QEMU, for example, to filter our
|
||||
# RPC commands. See 'qemu-ga(8)' man page for permissible arguments.
|
||||
#
|
||||
# You can get the list of RPC commands using "qemu-ga --blacklist='?'".
|
||||
# There should be no spaces between commas and commands in the blacklist.
|
||||
#BLACKLIST_RPC=guest-file-open,guest-file-close,guest-file-read,guest-file-write,guest-file-seek,guest-file-flush,guest-exec,guest-exec-status
|
||||
# For example, to filter out a set of commands the --block-rpcs commands:
|
||||
#
|
||||
#QEMU_GA_ARGS=--block-rpcs=guest-file-open,guest-file-close,guest-file-read,guest-file-write,guest-file-seek,guest-file-flush,guest-exec,guest-exec-status
|
||||
|
||||
# Fsfreeze hook script specification.
|
||||
#
|
||||
|
@ -7,11 +7,13 @@ IgnoreOnIsolate=True
|
||||
[Service]
|
||||
UMask=0077
|
||||
EnvironmentFile=/etc/sysconfig/qemu-ga
|
||||
# Support upgrades from QEMU < 9.1
|
||||
ExecStartPre=/bin/sh -c "if grep '^BLACKLIST_RPC' /etc/sysconfig/qemu-ga >/dev/null ; then sed -i 's/^BLACKLIST_RPC=/QEMU_GA_ARGS=--block-rpcs=/' /etc/sysconfig/qemu-ga ; fi"
|
||||
ExecStart=/usr/bin/qemu-ga \
|
||||
--method=virtio-serial \
|
||||
--path=/dev/virtio-ports/org.qemu.guest_agent.0 \
|
||||
--blacklist=${BLACKLIST_RPC} \
|
||||
-F${FSFREEZE_HOOK_PATHNAME}
|
||||
-F${FSFREEZE_HOOK_PATHNAME} \
|
||||
$QEMU_GA_ARGS
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
|
||||
|
10
qemu-kvm.sh
10
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 "$@"
|
27
rpminspect.yaml
Normal file
27
rpminspect.yaml
Normal file
@ -0,0 +1,27 @@
|
||||
# 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)$
|
||||
|
||||
|
||||
inspections:
|
||||
# complains about qemu use of: gethostbyname, inet_aton, inet_ntoa
|
||||
# Warning here isn't really accomplishing anything
|
||||
badfuncs: off
|
||||
|
||||
# bundled edk2 source CryptoPkg fuzz tests have invalid unicode,
|
||||
# but I assume that's intentional
|
||||
#
|
||||
# We would exclude that path using `unicode:` section, but fedora CI
|
||||
# doesn't allow it:
|
||||
# rpminspect: *** ignoring 'unicode' section in ...rpminspect.yaml; only allowed in system-wide configuration
|
||||
#
|
||||
# So instead we fully disable the unicode check
|
||||
unicode: off
|
192
schedattr.patch
Normal file
192
schedattr.patch
Normal file
@ -0,0 +1,192 @@
|
||||
From qemu-devel-bounces+berrange=redhat.com@nongnu.org Fri Oct 11 20:32:42 2024
|
||||
Delivered-To: berrange@gapps.redhat.com
|
||||
Received: by 2002:a05:612c:fcb:b0:49e:3967:5c with SMTP id kg11csp620284vqb;
|
||||
Fri, 11 Oct 2024 12:32:43 -0700 (PDT)
|
||||
X-Forwarded-Encrypted: i=2; AJvYcCXPcgyQ0/+OIS7vrT6LX5S6B3Hgz9IoezpGzlHzuQ86lhsSq6u4TrVfGwET6WFesjl4msgGP886/Q==@gapps.redhat.com
|
||||
X-Google-Smtp-Source: AGHT+IGI1MzgaHjMk041SIq3SzZGJRAF05keA8usOtLVfsqz+UnG8gS/7JH2MnqELZrotA/GJ+FI
|
||||
X-Received: by 2002:a05:6870:530c:b0:277:e35a:d2d5 with SMTP id 586e51a60fabf-2886e0d7223mr2593115fac.47.1728675162879;
|
||||
Fri, 11 Oct 2024 12:32:42 -0700 (PDT)
|
||||
ARC-Seal: i=1; a=rsa-sha256; t=1728675162; cv=none;
|
||||
d=google.com; s=arc-20240605;
|
||||
b=alETPlokQysotchMz04b4QkeW4n7IaCvDHuYMZh698k8mF5RJMclj7AfzOWMyGXURw
|
||||
kFfdMDxoHBlzWY9bTAGsH6EBkFDcJ9RyMs2Oy/exl09b3Zbt/LaW/PgqJZWi7DqZe7FD
|
||||
Zo3bqW5OSwWxU/vpy6n8B4EV22uFeRNhdTlzj0nbU4h+YpUcUzXR++ssowqa367TMQ5s
|
||||
THtVdddGT62AlbkeybdC/gTVxTt0RktEBMKTh+MzuZJ1rcgMb+pbG6h/XF5Iub2C+szk
|
||||
EkyaW96aO1YTzalK4HCCL7cuCauVGvVShSjUfPFMqXRxvzVfFqn02zZh6C4AXb/a/gIT
|
||||
YiXA==
|
||||
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
|
||||
h=content-transfer-encoding:sender:errors-to:list-subscribe:list-help
|
||||
:list-post:list-archive:list-unsubscribe:list-id:precedence
|
||||
:mime-version:message-id:date:subject:cc:to:from:delivered-to;
|
||||
bh=PO9IbOEY2YqKRkyInUx1mFCEKdNyF6F1Ade1P8ET5cM=;
|
||||
fh=xgCffyEVvm6hjKwQ8pT/suARWWrEEvCTAvMVKpBgaZg=;
|
||||
b=Q4fnfvzilypAHQRG6QbhiDXJWTDiP8dnRA4CB3fnXjC3sGRa+4+abHQkdOy6pMW4T9
|
||||
HhCdtLquJqRIBSQNVEVZMN5bFDX+gIaEA6pmEbd8Sdi47dl2+VS7vP9dQWf/FOtrkGqg
|
||||
D6K6DlbOdtzmdoTtWcI9Zm1eg6/98cVH2/hqzO/Ig1eI47UvIJpZtm3CMa3y5BgoJhmX
|
||||
v1pxjLmbVwmOdo8YkXgT3bH5iAPwXjn8FU7q4Z+CX3XChIQksWGvkB+zR/d7xqsEEdTv
|
||||
x85zJC/K4M9DAnuyJA2rIcrt/QUDHpdAPfcV2gDWr4IBhF27Ul9j6vjXzKNHaGjJxXbF
|
||||
hFsw==;
|
||||
dara=google.com
|
||||
ARC-Authentication-Results: i=1; mx.google.com;
|
||||
spf=pass (google.com: domain of qemu-devel-bounces+berrange=redhat.com@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+berrange=redhat.com@nongnu.org"
|
||||
Return-Path: <qemu-devel-bounces+berrange=redhat.com@nongnu.org>
|
||||
Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-inbound-delivery-1.mimecast.com. [205.139.110.120])
|
||||
by mx.google.com with ESMTPS id af79cd13be357-7b114998ee3si449329885a.281.2024.10.11.12.32.42
|
||||
for <berrange@gapps.redhat.com>
|
||||
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||
Fri, 11 Oct 2024 12:32:42 -0700 (PDT)
|
||||
Received-SPF: pass (google.com: domain of qemu-devel-bounces+berrange=redhat.com@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17;
|
||||
Authentication-Results: mx.google.com;
|
||||
spf=pass (google.com: domain of qemu-devel-bounces+berrange=redhat.com@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+berrange=redhat.com@nongnu.org"
|
||||
Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com
|
||||
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
|
||||
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
|
||||
cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-mwcDIPw2Ma-2fc8EyJ2Anw-1; Fri,
|
||||
11 Oct 2024 15:32:41 -0400
|
||||
X-MC-Unique: mwcDIPw2Ma-2fc8EyJ2Anw-1
|
||||
Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
|
||||
(No client certificate requested)
|
||||
by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A96C819560AE
|
||||
for <berrange@gapps.redhat.com>; Fri, 11 Oct 2024 19:32:40 +0000 (UTC)
|
||||
Received: by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)
|
||||
id A3F151956089; Fri, 11 Oct 2024 19:32:40 +0000 (UTC)
|
||||
Delivered-To: berrange@redhat.com
|
||||
Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.23])
|
||||
by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9EAE41955F42
|
||||
for <berrange@redhat.com>; Fri, 11 Oct 2024 19:32:40 +0000 (UTC)
|
||||
Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
|
||||
(No client certificate requested)
|
||||
by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A35819560B5
|
||||
for <berrange@redhat.com>; Fri, 11 Oct 2024 19:32:40 +0000 (UTC)
|
||||
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
|
||||
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,
|
||||
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
|
||||
us-mta-656-VIioc_tgPx6dfe3wuTFP4A-1; Fri, 11 Oct 2024 15:32:38 -0400
|
||||
X-MC-Unique: VIioc_tgPx6dfe3wuTFP4A-1
|
||||
Received: from localhost ([::1] helo=lists1p.gnu.org)
|
||||
by lists.gnu.org with esmtp (Exim 4.90_1)
|
||||
(envelope-from <qemu-devel-bounces@nongnu.org>)
|
||||
id 1szLMh-00020r-5j; Fri, 11 Oct 2024 15:31:55 -0400
|
||||
Received: from eggs.gnu.org ([2001:470:142:3::10])
|
||||
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
|
||||
(Exim 4.90_1) (envelope-from <raj.khem@gmail.com>)
|
||||
id 1szLMb-00020P-1q
|
||||
for qemu-devel@nongnu.org; Fri, 11 Oct 2024 15:31:51 -0400
|
||||
Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635])
|
||||
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
|
||||
(Exim 4.90_1) (envelope-from <raj.khem@gmail.com>)
|
||||
id 1szLMW-0003EY-RE
|
||||
for qemu-devel@nongnu.org; Fri, 11 Oct 2024 15:31:46 -0400
|
||||
Received: by mail-pl1-x635.google.com with SMTP id
|
||||
d9443c01a7336-20bb610be6aso25161715ad.1
|
||||
for <qemu-devel@nongnu.org>; Fri, 11 Oct 2024 12:31:44 -0700 (PDT)
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20230601; t=1728675103; x=1729279903;
|
||||
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
|
||||
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
|
||||
:reply-to;
|
||||
bh=PO9IbOEY2YqKRkyInUx1mFCEKdNyF6F1Ade1P8ET5cM=;
|
||||
b=K3X31NNuvHdknW5P8UcnhDjhiG8YvVt80acZ9o0cp4OYATGyivVrgqlV16YtlE7nbP
|
||||
c2GxVasHb4XHOFgQ/OS9twOzcL7BvXjTYuSlqOjY9QQ9Ng38MAMFgLpleBdUdi0JHrfh
|
||||
vH2pyWqiWlGfPiDmnJWawogp9bgGCHsqyjPUtcw1LCUqNNx0sfyV98mwYq27/2m4POny
|
||||
BQ0yFM/O7SF2EkZuaQwCJWPmH3fQatSgwEAq5u1SGy/Tn9a9GB4Iyolqgm4mMJBiful/
|
||||
xoI0a2JEsYatNItIvqoWJ5uBgwrOZHldhxPZGCUP9cL5ecB1flcnPXHxLR4p0/kiQzuI
|
||||
LzCw==
|
||||
X-Gm-Message-State: AOJu0YxWyAwGwQqYK1sZdfMljusz9BkH4fhylN1UvHETC7GDQDWtfFQS
|
||||
zz40Z5A7yrfIoS4SkMLM2xTSe57qyfKfFPHRVJe68kPHnsvbdEUpZAecLqJ/
|
||||
X-Received: by 2002:a17:902:d2c5:b0:20c:a644:817f with SMTP id
|
||||
d9443c01a7336-20ca6448261mr49539675ad.7.1728675103070;
|
||||
Fri, 11 Oct 2024 12:31:43 -0700 (PDT)
|
||||
Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::f083])
|
||||
by smtp.gmail.com with ESMTPSA id
|
||||
d9443c01a7336-20c8bc13551sm26871055ad.88.2024.10.11.12.31.42
|
||||
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||
Fri, 11 Oct 2024 12:31:42 -0700 (PDT)
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
To: qemu-devel@nongnu.org
|
||||
Cc: Khem Raj <raj.khem@gmail.com>, Laurent Vivier <laurent@vivier.eu>,
|
||||
Paolo Bonzini <pbonzini@redhat.com>
|
||||
Subject: [PATCH v2] sched_attr: Do not define for glibc >= 2.41
|
||||
Date: Fri, 11 Oct 2024 12:31:40 -0700
|
||||
Message-ID: <20241011193140.1047648-1-raj.khem@gmail.com>
|
||||
MIME-Version: 1.0
|
||||
X-Spam_score_int: -20
|
||||
X-Spam_score: -2.1
|
||||
X-Spam_bar: --
|
||||
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
|
||||
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
|
||||
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
|
||||
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
|
||||
X-Spam_action: no action
|
||||
X-BeenThere: qemu-devel@nongnu.org
|
||||
X-Mailman-Version: 2.1.29
|
||||
Precedence: list
|
||||
List-Id: <qemu-devel.nongnu.org>
|
||||
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
|
||||
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
|
||||
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
|
||||
List-Post: <mailto:qemu-devel@nongnu.org>
|
||||
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
|
||||
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
|
||||
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
|
||||
Errors-To: qemu-devel-bounces+berrange=redhat.com@nongnu.org
|
||||
Sender: qemu-devel-bounces+berrange=redhat.com@nongnu.org
|
||||
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition;Similar Internal Domain=false;Similar Monitored External Domain=false;Custom External Domain=false;Mimecast External Domain=false;Newly Observed Domain=false;Internal User Name=false;Custom Display Name List=false;Reply-to Address Mismatch=false;Targeted Threat Dictionary=false;Mimecast Threat Dictionary=false;Custom Threat Dictionary=false
|
||||
X-Mimecast-Bulk-Signature: yes
|
||||
X-Mimecast-Spam-Signature: bulk
|
||||
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15
|
||||
X-Mimecast-Spam-Score: 0
|
||||
X-Mimecast-Originator: gmail.com
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-Type: text/plain; charset="US-ASCII"; x-default=true
|
||||
Status: RO
|
||||
Content-Length: 1578
|
||||
Lines: 42
|
||||
|
||||
glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions
|
||||
and struct sched_attr. Therefore, it needs to be checked for here as well before
|
||||
defining sched_attr
|
||||
|
||||
Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0
|
||||
|
||||
Fixes builds with glibc/trunk
|
||||
|
||||
[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Laurent Vivier <laurent@vivier.eu>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check
|
||||
|
||||
linux-user/syscall.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 1354e75694..caecbb765d 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -359,7 +359,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
|
||||
#define __NR_sys_sched_setaffinity __NR_sched_setaffinity
|
||||
_syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
|
||||
unsigned long *, user_mask_ptr);
|
||||
-/* sched_attr is not defined in glibc */
|
||||
+/* sched_attr is not defined in glibc < 2.41 */
|
||||
+#ifndef SCHED_ATTR_SIZE_VER0
|
||||
struct sched_attr {
|
||||
uint32_t size;
|
||||
uint32_t sched_policy;
|
||||
@@ -372,6 +373,7 @@ struct sched_attr {
|
||||
uint32_t sched_util_min;
|
||||
uint32_t sched_util_max;
|
||||
};
|
||||
+#endif
|
||||
#define __NR_sys_sched_getattr __NR_sched_getattr
|
||||
_syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
|
||||
unsigned int, size, unsigned int, flags);
|
||||
|
||||
|
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (qemu-5.2.0-rc4.tar.xz) = 47e918392609c34f904962e5759125485407ae52c273053729054300e10fc67fc7ed443c9af25d1d852a5f5c70eee125c703ce15d0e571068848f405de33db3b
|
||||
SHA512 (qemu-9.2.0.tar.xz) = f92548623e4e31400c823a2d78417a8a4ecfccb07f3ee4883e2f2ad33054539d2a37d076dbc64df42c6c86c08fa7c2c975cd6e823aa14d5f20cef83348006813
|
||||
SHA512 (qemu-9.2.0.tar.xz.sig) = 0200d0b88c423bbde2ae279f33a9bfda8b3f44da5f36f79fa687fa301f62e130ff88c12a6f984d74efb6af7609cd77e6501a3779f7536093f012d25920ff59e0
|
||||
|
20
tests/main.fmf
Normal file
20
tests/main.fmf
Normal file
@ -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
|
3
vhost.conf
Normal file
3
vhost.conf
Normal file
@ -0,0 +1,3 @@
|
||||
# Increase default vhost memory map limit to match
|
||||
# KVM's memory slot limit
|
||||
options vhost max_mem_regions=509
|
Loading…
x
Reference in New Issue
Block a user