PR#3: Update to v9.1.0 for hyperscale release - rpms/qemu

		`@@ -0,0 +1,49 @@`
		`+ From 34acc8e0028bf059c9c4e725c653df56eac7c296 Mon Sep 17 00:00:00 2001`
		`+ Message-ID: <34acc8e0028bf059c9c4e725c653df56eac7c296.1724767601.git.crobinso@redhat.com>`
		`+ 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
		`+ Content-type: text/plain`
		`+`
		`+ Upstream issue:`
		`+ https://gitlab.com/qemu-project/qemu/-/issues/2541`
		`+`
		`+ Signed-off-by: Cole Robinson <crobinso@redhat.com>`
		`+ ---`
		`+ tests/qtest/virtio-9p-test.c \| 20 ++++++++++----------`
		`+ 1 file changed, 10 insertions(+), 10 deletions(-)`
		`+`
		`+ diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c`
		`+ index 3c8cd235cf..1d550eafb1 100644`
		`+ --- a/tests/qtest/virtio-9p-test.c`
		`+ +++ b/tests/qtest/virtio-9p-test.c`
		`+ @@ -748,16 +748,16 @@ 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);`
		`+ - 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);`
		`+ - qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts);`
		`+ - qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts);`
		`+ - qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink,`
		`+ - &opts);`
		`+ - qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, &opts);`
		`+ - qos_add_test("local/unlinkat_hardlink", "virtio-9p", fs_unlinkat_hardlink,`
		`+ - &opts);`
		`+ + /* 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); */`
		`+ + /* qos_add_test("local/unlinkat_file", "virtio-9p", fs_unlinkat_file, &opts); */`
		`+ + /* qos_add_test("local/symlink_file", "virtio-9p", fs_symlink_file, &opts); */`
		`+ + /* qos_add_test("local/unlinkat_symlink", "virtio-9p", fs_unlinkat_symlink, */`
		`+ + /* &opts); */`
		`+ + /* qos_add_test("local/hardlink_file", "virtio-9p", fs_hardlink_file, &opts); */`
		`+ + /* qos_add_test("local/unlinkat_hardlink", "virtio-9p", fs_unlinkat_hardlink, */`
		`+ + /* &opts); */`
		`+ }`
		`+`
		`+ libqos_init(register_virtio_9p_test);`
		`+ --`
		`+ 2.46.0`
		`+`

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

file removed

-52

		`@@ -1,52 +0,0 @@`
		`- From 12cbd48e1e78f07b19df900b0f9ccdd633aa42ee 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 \| 12 +++++++++++-`
		`- 1 file changed, 11 insertions(+), 1 deletion(-)`
		`-`
		`- diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile`
		`- index 30d07026c7..87cfc484c7 100644`
		`- --- a/pc-bios/optionrom/Makefile`
		`- +++ b/pc-bios/optionrom/Makefile`
		`- @@ -38,6 +38,16 @@ config-cc.mak: Makefile`
		`-`
		`- override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds`
		`-`
		`- +ld-test = $(LD) -v $1 >/dev/null 2>/dev/null`
		`- +ld-option = if $(call ld-test, $1); then \`
		`- + echo "$(TARGET_PREFIX)$1 detected" && echo "override LDFLAGS += -Wl,$1" >&3; else \`
		`- + echo "$(TARGET_PREFIX)$1 not detected" $(if $2,&& echo "override LDFLAGS += $2" >&3); fi`
		`- +`
		`- +config-ld.mak: Makefile`
		`- + $(quiet-@)($(call ld-option,--no-warn-rwx-segments); \`
		`- + $(call ld-option,--no-warn-execstack)) 3> config-ld.mak`
		`- +-include config-ld.mak`
		`- +`
		`- pvh.img: pvh.o pvh_main.o`
		`-`
		`- %.o: %.S`
		`- @@ -61,7 +71,7 @@ clean:`
		`- rm -f .o .d .raw .img .bin ~`
		`-`
		`- distclean:`
		`- - rm -f config-cc.mak`
		`- + rm -f config-cc.mak config-ld.mak`
		`-`
		`- # suppress auto-removal of intermediate files`
		`- .SECONDARY:`

0001-relax-CA-certs-checks.patch

file added

+31

		`@@ -0,0 +1,31 @@`
		`+ From: Roberto Campesato <render@metalabs.org>`
		`+ diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c`
		`+ --- a/crypto/tlscredsx509.c`
		`+ +++ b/crypto/tlscredsx509.c`
		`+ @@ -502,14 +502,6 @@ qcrypto_tls_creds_x509_sanity_check(QCryptoTLSCredsX509 *creds,`
		`+ goto cleanup;`
		`+ }`
		`+`
		`+ - for (i = 0; i < ncacerts; i++) {`
		`+ - if (qcrypto_tls_creds_check_cert(creds,`
		`+ - cacerts[i], cacertFile,`
		`+ - isServer, true, errp) < 0) {`
		`+ - goto cleanup;`
		`+ - }`
		`+ - }`
		`+ -`
		`+ if (cert && ncacerts &&`
		`+ qcrypto_tls_creds_check_cert_pair(cert, certFile, cacerts,`
		`+ ncacerts, cacertFile,`
		`+ diff --git a/tests/unit/test-crypto-tlscredsx509.c b/tests/unit/test-crypto-tlscredsx509.c`
		`+ --- a/tests/unit/test-crypto-tlscredsx509.c`
		`+ +++ b/tests/unit/test-crypto-tlscredsx509.c`
		`+ @@ -285,7 +285,7 @@ int main(int argc, char **argv)`
		`+ TLS_TEST_REG(badca1, true, cacert4req.filename, servercert4req.filename,`
		`+ true);`
		`+ TLS_TEST_REG(badca2, true,`
		`+ - cacert5req.filename, servercert5req.filename, true);`
		`+ + cacert5req.filename, servercert5req.filename, false);`
		`+ TLS_TEST_REG(badca3, true,`
		`+ cacert6req.filename, servercert6req.filename, true);`
		`+`

0003-linux-user-default-cpu-model.patch

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ From: Roberto Campesato <render@metalabs.org>`
		`+ diff --git a/linux-user/main.c b/linux-user/main.c`
		`+ index 0cdaf30d34..553faf1309 100644`
		`+ --- a/linux-user/main.c`
		`+ +++ b/linux-user/main.c`
		`+ @@ -357,6 +357,10 @@ static void handle_arg_uname(const char *arg)`
		`+`
		`+ static void handle_arg_cpu(const char *arg)`
		`+ {`
		`+ + if (cpu_model != NULL) {`
		`+ + free(cpu_model);`
		`+ + cpu_model = NULL;`
		`+ + }`
		`+ cpu_model = strdup(arg);`
		`+ if (cpu_model == NULL \|\| is_help_option(cpu_model)) {`
		`+ list_cpus();`
		`+ @@ -717,7 +721,16 @@ int main(int argc, char argv, char envp)`
		`+ }`
		`+ }`
		`+`
		`+ + /* This is a pretty disgusting hack, in place to get a default`
		`+ + CPU that has x86_64-v2 support, required for emulating a`
		`+ + CPU that CentOS 9 is happy to run on (via binfmt_misc). */`
		`+ +#if defined(TARGET_X86_64) && !defined(__x86_64__)`
		`+ + cpu_model = strdup("Nehalem-v1");`
		`+ +#elif defined(TARGET_AARCH64) && !defined(__aarch64__)`
		`+ + cpu_model = strdup("cortex-a72");`
		`+ +#else`
		`+ cpu_model = NULL;`
		`+ +#endif`
		`+`
		`+ qemu_add_opts(&qemu_trace_opts);`
		`+ qemu_plugin_add_opts();`

0004-BTRFS_V2_IOCTLS.patch

file added

+123

		`@@ -0,0 +1,123 @@`
		`+ From: Roberto Campesato <render@metalabs.org>`
		`+ diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h`
		`+ --- a/linux-user/ioctls.h`
		`+ +++ b/linux-user/ioctls.h`
		`+ @@ -154,6 +154,10 @@`
		`+ IOCTL(BTRFS_IOC_SNAP_CREATE, IOC_W,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args)))`
		`+ #endif`
		`+ +#ifdef BTRFS_IOC_SNAP_CREATE_V2`
		`+ + IOCTL(BTRFS_IOC_SNAP_CREATE_V2, IOC_W,`
		`+ + MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args_v2)))`
		`+ +#endif`
		`+ #ifdef BTRFS_IOC_SCAN_DEV`
		`+ IOCTL(BTRFS_IOC_SCAN_DEV, IOC_W,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args)))`
		`+ @@ -170,14 +174,26 @@`
		`+ IOCTL(BTRFS_IOC_RM_DEV, IOC_W,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args)))`
		`+ #endif`
		`+ +#ifdef BTRFS_IOC_RM_DEV_V2`
		`+ + IOCTL(BTRFS_IOC_RM_DEV_V2, IOC_W,`
		`+ + MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args_v2)))`
		`+ +#endif`
		`+ #ifdef BTRFS_IOC_SUBVOL_CREATE`
		`+ IOCTL(BTRFS_IOC_SUBVOL_CREATE, IOC_W,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args)))`
		`+ #endif`
		`+ +#ifdef BTRFS_IOC_SUBVOL_CREATE_V2`
		`+ + IOCTL(BTRFS_IOC_SUBVOL_CREATE_V2, IOC_W,`
		`+ + MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args_v2)))`
		`+ +#endif`
		`+ #ifdef BTRFS_IOC_SNAP_DESTROY`
		`+ IOCTL(BTRFS_IOC_SNAP_DESTROY, IOC_W,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args)))`
		`+ #endif`
		`+ +#ifdef BTRFS_IOC_SNAP_DESTROY_V2`
		`+ + IOCTL(BTRFS_IOC_SNAP_DESTROY_V2, IOC_W,`
		`+ + MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_vol_args_v2)))`
		`+ +#endif`
		`+ #ifdef BTRFS_IOC_INO_LOOKUP`
		`+ IOCTL(BTRFS_IOC_INO_LOOKUP, IOC_RW,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_ino_lookup_args)))`
		`+ @@ -273,6 +289,10 @@`
		`+ IOCTL(BTRFS_IOC_INO_LOOKUP_USER, IOC_RW,`
		`+ MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_ino_lookup_user_args)))`
		`+ #endif`
		`+ +#ifdef BTRFS_IOC_TREE_SEARCH`
		`+ + IOCTL(BTRFS_IOC_TREE_SEARCH, IOC_RW,`
		`+ + MK_PTR(MK_STRUCT(STRUCT_btrfs_ioctl_search_args)))`
		`+ +#endif`
		`+`
		`+ #ifdef CONFIG_USBFS`
		`+ /* USB ioctls */`
		`+ diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h`
		`+ --- a/linux-user/syscall_defs.h`
		`+ +++ b/linux-user/syscall_defs.h`
		`+ @@ -966,9 +966,12 @@`
		`+ #define TARGET_BTRFS_IOC_RM_DEV TARGET_IOWU(BTRFS_IOCTL_MAGIC, 11)`
		`+ #define TARGET_BTRFS_IOC_SUBVOL_CREATE TARGET_IOWU(BTRFS_IOCTL_MAGIC, 14)`
		`+ #define TARGET_BTRFS_IOC_SNAP_DESTROY TARGET_IOWU(BTRFS_IOCTL_MAGIC, 15)`
		`+ +#define TARGET_BTRFS_IOC_TREE_SEARCH TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 17)`
		`+ #define TARGET_BTRFS_IOC_INO_LOOKUP TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 18)`
		`+ #define TARGET_BTRFS_IOC_DEFAULT_SUBVOL TARGET_IOW(BTRFS_IOCTL_MAGIC, 19, \`
		`+ abi_ullong)`
		`+ +#define TARGET_BTRFS_IOC_SNAP_CREATE_V2 TARGET_IOWU(BTRFS_IOCTL_MAGIC, 23)`
		`+ +#define TARGET_BTRFS_IOC_SUBVOL_CREATE_V2 TARGET_IOWU(BTRFS_IOCTL_MAGIC, 24)`
		`+ #define TARGET_BTRFS_IOC_SUBVOL_GETFLAGS TARGET_IOR(BTRFS_IOCTL_MAGIC, 25, \`
		`+ abi_ullong)`
		`+ #define TARGET_BTRFS_IOC_SUBVOL_SETFLAGS TARGET_IOW(BTRFS_IOCTL_MAGIC, 26, \`
		`+ @@ -990,10 +993,12 @@`
		`+ #define TARGET_BTRFS_IOC_GET_FEATURES TARGET_IORU(BTRFS_IOCTL_MAGIC, 57)`
		`+ #define TARGET_BTRFS_IOC_SET_FEATURES TARGET_IOWU(BTRFS_IOCTL_MAGIC, 57)`
		`+ #define TARGET_BTRFS_IOC_GET_SUPPORTED_FEATURES TARGET_IORU(BTRFS_IOCTL_MAGIC, 57)`
		`+ +#define TARGET_BTRFS_IOC_RM_DEV_V2 TARGET_IOWU(BTRFS_IOCTL_MAGIC, 58)`
		`+ #define TARGET_BTRFS_IOC_LOGICAL_INO_V2 TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 59)`
		`+ #define TARGET_BTRFS_IOC_GET_SUBVOL_INFO TARGET_IORU(BTRFS_IOCTL_MAGIC, 60)`
		`+ #define TARGET_BTRFS_IOC_GET_SUBVOL_ROOTREF TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 61)`
		`+ #define TARGET_BTRFS_IOC_INO_LOOKUP_USER TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 62)`
		`+ +#define TARGET_BTRFS_IOC_SNAP_DESTROY_V2 TARGET_IOWU(BTRFS_IOCTL_MAGIC, 63)`
		`+ #endif`
		`+`
		`+ /* usb ioctls */`
		`+ diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h`
		`+ --- a/linux-user/syscall_types.h`
		`+ +++ b/linux-user/syscall_types.h`
		`+ @@ -373,6 +373,37 @@`
		`+ MK_ARRAY(TYPE_CHAR, BTRFS_PATH_NAME_MAX + 1)) /* name */`
		`+ #endif`
		`+`
		`+ +#if defined(BTRFS_IOC_SNAP_CREATE_V2) \|\| \`
		`+ + defined(BTRFS_IOC_SUBVOL_CREATE_V2) \|\| \`
		`+ + defined(BTRFS_IOC_RM_DEV_V2) \|\| defined(BTRFS_IOC_SNAP_DESTROY_V2)`
		`+ +STRUCT(btrfs_ioctl_vol_args_v2,`
		`+ + TYPE_LONGLONG, /* fd */`
		`+ + TYPE_ULONGLONG, /* transid */`
		`+ + TYPE_ULONGLONG, /* flags */`
		`+ + MK_ARRAY(TYPE_ULONGLONG, 4), /* unused */`
		`+ + MK_ARRAY(TYPE_CHAR, BTRFS_SUBVOL_NAME_MAX + 1)) /* name */`
		`+ +#endif`
		`+ +`
		`+ +#ifdef BTRFS_IOC_TREE_SEARCH`
		`+ +STRUCT(btrfs_ioctl_search_args,`
		`+ + TYPE_ULONGLONG, /* tree_id */`
		`+ + TYPE_ULONGLONG, /* min_objectid */`
		`+ + TYPE_ULONGLONG, /* max_objectid */`
		`+ + TYPE_ULONGLONG, /* min_offset */`
		`+ + TYPE_ULONGLONG, /* max_offset */`
		`+ + TYPE_ULONGLONG, /* min_transid */`
		`+ + TYPE_ULONGLONG, /* max_transid */`
		`+ + TYPE_INT, /* min_type */`
		`+ + TYPE_INT, /* max_type */`
		`+ + TYPE_INT, /* nr_items */`
		`+ + TYPE_INT, /* unused */`
		`+ + TYPE_ULONGLONG, /* unused1 */`
		`+ + TYPE_ULONGLONG, /* unused2 */`
		`+ + TYPE_ULONGLONG, /* unused3 */`
		`+ + TYPE_ULONGLONG, /* unused4 */`
		`+ + MK_ARRAY(TYPE_CHAR, BTRFS_SEARCH_ARGS_BUFSIZE)) /* buf */`
		`+ +#endif`
		`+ +`
		`+ #ifdef BTRFS_IOC_GET_SUBVOL_INFO`
		`+ STRUCT(btrfs_ioctl_timespec,`
		`+ TYPE_ULONGLONG, /* sec */`

0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch

file added

+53

		`@@ -0,0 +1,53 @@`
		`+ From: Roberto Campesato <render@metalabs.org>`
		`+ diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c`
		`+ index 75d11a07b2..4da3b75af9 100644`
		`+ --- a/accel/kvm/kvm-all.c`
		`+ +++ b/accel/kvm/kvm-all.c`
		`+ @@ -2966,9 +2966,13 @@ int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private)`
		`+ */`
		`+ goto out_unref;`
		`+ }`
		`+ - ret = ram_block_discard_range(rb, offset, size);`
		`+ + ret = ram_block_discard_is_disabled()`
		`+ + ? ram_block_discard_range(rb, offset, size)`
		`+ + : 0;`
		`+ } else {`
		`+ - ret = ram_block_discard_guest_memfd_range(rb, offset, size);`
		`+ + ret = ram_block_discard_is_disabled()`
		`+ + ? ram_block_discard_guest_memfd_range(rb, offset, size)`
		`+ + : 0;`
		`+ }`
		`+`
		`+ out_unref:`
		`+ diff --git a/system/physmem.c b/system/physmem.c`
		`+ index 94600a33ec..16e1dd4f22 100644`
		`+ --- a/system/physmem.c`
		`+ +++ b/system/physmem.c`
		`+ @@ -1880,19 +1880,10 @@ static void ram_block_add(RAMBlock new_block, Error *errp)`
		`+ }`
		`+`
		`+ if (new_block->flags & RAM_GUEST_MEMFD) {`
		`+ - int ret;`
		`+`
		`+ assert(kvm_enabled());`
		`+ assert(new_block->guest_memfd < 0);`
		`+`
		`+ - ret = ram_block_discard_require(true);`
		`+ - if (ret < 0) {`
		`+ - error_setg_errno(errp, -ret,`
		`+ - "cannot set up private guest memory: discard currently blocked");`
		`+ - error_append_hint(errp, "Are you using assigned devices?\n");`
		`+ - goto out_free;`
		`+ - }`
		`+ -`
		`+ new_block->guest_memfd = kvm_create_guest_memfd(new_block->max_length,`
		`+ 0, errp);`
		`+ if (new_block->guest_memfd < 0) {`
		`+ @@ -2156,7 +2147,6 @@ static void reclaim_ramblock(RAMBlock *block)`
		`+`
		`+ if (block->guest_memfd >= 0) {`
		`+ close(block->guest_memfd);`
		`+ - ram_block_discard_require(false);`
		`+ }`
		`+`
		`+ g_free(block);`

2df5c1f5b014126595a26c6797089d284a3b211c.patch

file removed

-82

		`@@ -1,82 +0,0 @@`
		`- From 2df5c1f5b014126595a26c6797089d284a3b211c Mon Sep 17 00:00:00 2001`
		`- From: Harsh Prateek Bora <harshpb@linux.ibm.com>`
		`- Date: Wed, 24 Jan 2024 10:30:55 +1000`
		`- Subject: [PATCH] ppc/spapr: Introduce SPAPR_IRQ_NR_IPIS to refer IRQ range for`
		`- CPU IPIs.`
		`- MIME-Version: 1.0`
		`- Content-Type: text/plain; charset=UTF-8`
		`- Content-Transfer-Encoding: 8bit`
		`-`
		`- spapr_irq_init currently uses existing macro SPAPR_XIRQ_BASE to refer to`
		`- the range of CPU IPIs during initialization of nr-irqs property.`
		`- It is more appropriate to have its own define which can be further`
		`- reused as appropriate for correct interpretation.`
		`-`
		`- Suggested-by: Cedric Le Goater <clg@kaod.org>`
		`- Reviewed-by: Cédric Le Goater <clg@kaod.org>`
		`- Tested-by: Kowshik Jois <kowsjois@linux.ibm.com>`
		`- Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>`
		`- Signed-off-by: Nicholas Piggin <npiggin@gmail.com>`
		`- ---`
		`- hw/ppc/spapr_irq.c \| 6 ++++--`
		`- include/hw/ppc/spapr_irq.h \| 14 +++++++++++++-`
		`- 2 files changed, 17 insertions(+), 3 deletions(-)`
		`-`
		`- diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c`
		`- index a0d1e1298e1e..97b2fc42ab03 100644`
		`- --- a/hw/ppc/spapr_irq.c`
		`- +++ b/hw/ppc/spapr_irq.c`
		`- @@ -23,6 +23,8 @@`
		`-`
		`- #include "trace.h"`
		`-`
		`- +QEMU_BUILD_BUG_ON(SPAPR_IRQ_NR_IPIS > SPAPR_XIRQ_BASE);`
		`- +`
		`- static const TypeInfo spapr_intc_info = {`
		`- .name = TYPE_SPAPR_INTC,`
		`- .parent = TYPE_INTERFACE,`
		`- @@ -329,7 +331,7 @@ void spapr_irq_init(SpaprMachineState spapr, Error *errp)`
		`- int i;`
		`-`
		`- dev = qdev_new(TYPE_SPAPR_XIVE);`
		`- - qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_XIRQ_BASE);`
		`- + qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_IRQ_NR_IPIS);`
		`- /*`
		`- * 8 XIVE END structures per CPU. One for each available`
		`- * priority`
		`- @@ -356,7 +358,7 @@ void spapr_irq_init(SpaprMachineState spapr, Error *errp)`
		`- }`
		`-`
		`- spapr->qirqs = qemu_allocate_irqs(spapr_set_irq, spapr,`
		`- - smc->nr_xirqs + SPAPR_XIRQ_BASE);`
		`- + smc->nr_xirqs + SPAPR_IRQ_NR_IPIS);`
		`-`
		`- /*`
		`- * Mostly we don't actually need this until reset, except that not`
		`- diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h`
		`- index c22a72c9e270..4fd2d5853d8b 100644`
		`- --- a/include/hw/ppc/spapr_irq.h`
		`- +++ b/include/hw/ppc/spapr_irq.h`
		`- @@ -14,9 +14,21 @@`
		`- #include "qom/object.h"`
		`-`
		`- /*`
		`- - * IRQ range offsets per device type`
		`- + * The XIVE IRQ backend uses the same layout as the XICS backend but`
		`- + * covers the full range of the IRQ number space. The IRQ numbers for`
		`- + * the CPU IPIs are allocated at the bottom of this space, below 4K,`
		`- + * to preserve compatibility with XICS which does not use that range.`
		`- + */`
		`- +`
		`- +/*`
		`- + * CPU IPI range (XIVE only)`
		`- */`
		`- #define SPAPR_IRQ_IPI 0x0`
		`- +#define SPAPR_IRQ_NR_IPIS 0x1000`
		`- +`
		`- +/*`
		`- + * IRQ range offsets per device type`
		`- + */`
		`-`
		`- #define SPAPR_XIRQ_BASE XICS_IRQ_BASE /* 0x1000 */`
		`- #define SPAPR_IRQ_EPOW (SPAPR_XIRQ_BASE + 0x0000)`

c4f91d7b7be76c47015521ab0109c6e998a369b0.patch

file removed

-75

		`@@ -1,75 +0,0 @@`
		`- From c4f91d7b7be76c47015521ab0109c6e998a369b0 Mon Sep 17 00:00:00 2001`
		`- From: Harsh Prateek Bora <harshpb@linux.ibm.com>`
		`- Date: Wed, 24 Jan 2024 10:30:55 +1000`
		`- Subject: [PATCH] ppc/spapr: Initialize max_cpus limit to SPAPR_IRQ_NR_IPIS.`
		`- MIME-Version: 1.0`
		`- Content-Type: text/plain; charset=UTF-8`
		`- Content-Transfer-Encoding: 8bit`
		`-`
		`- Initialize the machine specific max_cpus limit as per the maximum range`
		`- of CPU IPIs available. Keeping between 4096 to 8192 will throw IRQ not`
		`- free error due to XIVE/XICS limitation and keeping beyond 8192 will hit`
		`- assert in tcg_region_init or spapr_xive_claim_irq.`
		`-`
		`- Logs:`
		`-`
		`- Without patch fix:`
		`-`
		`- [root@host build]# qemu-system-ppc64 -accel tcg -smp 10,maxcpus=4097`
		`- qemu-system-ppc64: IRQ 4096 is not free`
		`- [root@host build]#`
		`-`
		`- On LPAR:`
		`- [root@host build]# qemu-system-ppc64 -accel tcg -smp 10,maxcpus=8193`
		`- **`
		`- ERROR:../tcg/region.c:774:tcg_region_init: assertion failed:`
		`- (region_size >= 2 * page_size)`
		`- Bail out! ERROR:../tcg/region.c:774:tcg_region_init: assertion failed:`
		`- (region_size >= 2 * page_size)`
		`- Aborted (core dumped)`
		`- [root@host build]#`
		`-`
		`- On x86:`
		`- [root@host build]# qemu-system-ppc64 -accel tcg -smp 10,maxcpus=8193`
		`- qemu-system-ppc64: ../hw/intc/spapr_xive.c:596: spapr_xive_claim_irq:`
		- Assertion `lisn < xive->nr_irqs' failed.
		`- Aborted (core dumped)`
		`- [root@host build]#`
		`-`
		`- With patch fix:`
		`- [root@host build]# qemu-system-ppc64 -accel tcg -smp 10,maxcpus=4097`
		`- qemu-system-ppc64: Invalid SMP CPUs 4097. The max CPUs supported by`
		`- machine 'pseries-8.2' is 4096`
		`- [root@host build]#`
		`-`
		`-`
		`- Reported-by: Kowshik Jois <kowsjois@linux.ibm.com>`
		`- Tested-by: Kowshik Jois <kowsjois@linux.ibm.com>`
		`- Reviewed-by: Cédric Le Goater <clg@kaod.org>`
		`- Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>`
		`- Signed-off-by: Nicholas Piggin <npiggin@gmail.com>`
		`- ---`
		`- hw/ppc/spapr.c \| 9 +++------`
		`- 1 file changed, 3 insertions(+), 6 deletions(-)`
		`-`
		`- diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c`
		`- index 0d72d286d80f..0028ce0b673b 100644`
		`- --- a/hw/ppc/spapr.c`
		`- +++ b/hw/ppc/spapr.c`
		`- @@ -4639,13 +4639,10 @@ static void spapr_machine_class_init(ObjectClass oc, void data)`
		`- mc->block_default_type = IF_SCSI;`
		`-`
		`- /*`
		`- - * Setting max_cpus to INT32_MAX. Both KVM and TCG max_cpus values`
		`- - * should be limited by the host capability instead of hardcoded.`
		`- - * max_cpus for KVM guests will be checked in kvm_init(), and TCG`
		`- - * guests are welcome to have as many CPUs as the host are capable`
		`- - * of emulate.`
		`- + * While KVM determines max cpus in kvm_init() using kvm_max_vcpus(),`
		`- + * In TCG the limit is restricted by the range of CPU IPIs available.`
		`- */`
		`- - mc->max_cpus = INT32_MAX;`
		`- + mc->max_cpus = SPAPR_IRQ_NR_IPIS;`
		`-`
		`- mc->no_parallel = 1;`
		`- mc->default_boot_order = "";`

qemu-fifreeze-fithaw.patch

file removed

-210

		`@@ -1,210 +0,0 @@`
		`- From qemu-devel-bounces+rjones=redhat.com@nongnu.org Tue Feb 20 14:15:07 2024`
		`- X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on`
		`- rhmail.home.annexia.org`
		`- X-Spam-Level:`
		`- X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED,`
		`- FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,`
		`- T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2`
		`- Delivered-To: rjones@gapps.redhat.com`
		`- Received: from imap.gmail.com [2a00:1450:400c:c06::6c]`
		`- by rhmail.home.annexia.org with IMAP (fetchmail-6.3.24)`
		`- for <rjones@localhost> (single-drop); Tue, 20 Feb 2024 14:15:07 +0000 (GMT)`
		`- Received: by 2002:adf:9c85:0:b0:337:c4af:7eda with SMTP id d5csp1377865wre;`
		`- Tue, 20 Feb 2024 06:14:45 -0800 (PST)`
		`- X-Forwarded-Encrypted: i=2;`
		`- AJvYcCVmEOlyyvvd2pjxJlVqmm6wAsFvP2QS6RrV8WHdcPQ9BbSQtwkd4h6dvrOsn7U4WKwJ+S9i3pICvKhQ6p2IG/C63ey7jQaX6g==`
		`- X-Google-Smtp-Source: AGHT+IE5mSiEO9H5JEkHNlHfhZDS2s9/kx/Heg/BJJ4bRe1DByou2O4YqVcehEElFPcfnv1EbTzP`
		`- X-Received: by 2002:ac8:7e82:0:b0:42e:1a0c:5561 with SMTP id`
		`- w2-20020ac87e82000000b0042e1a0c5561mr4869415qtj.11.1708438485118; Tue, 20 Feb`
		`- 2024 06:14:45 -0800 (PST)`
		`- ARC-Seal: i=1; a=rsa-sha256; t=1708438485; cv=none; d=google.com;`
		`- s=arc-20160816;`
		`- b=ey2nB0Hz7p8/LRoN4jZjtpNuGZQ63SBhaAnxzcDl/T2RrxPzHh65rz1zmLdWzVCLkQ`
		`- v+yYlKkQFU8NNp3UT4S4zYwfeGSE1kFImALTRCMrWHrkw9LZZZb2BeEsiziU3hlaWROV`
		`- UVjYZdUHzbALZboflhpU0jK2UBurjafvHopQR7okuWukM2MkehE707uhOPscNCgZG8f9`
		`- ZtrZX2StAQhzGbE+rGPka9c6AdsKBWYcVUbAe//oQeRl1NCUorQedrseU25E1dcobqwl`
		`- 80kRNnHYH+GOx7inmTEi8W2DSWb3g48Q0EEVWc/sfDB/f2t6PO4sELzmSvhytswBISkg D57A==`
		`- ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;`
		`- s=arc-20160816;`
		`- 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=uNCdCIQzg/12W/RrXAVFQ1Isw/BMjvNQW4Y14ZuF5vg=;`
		`- fh=k0ip+oilfdxldYSElE+D70uElArHhwV8D0y78HTEik8=;`
		`- b=U8UgVOefnhiU8Ata8X00Xvx9Y6fexE3GSwQioOOaRIx9xhn1c0xjhLQ4N5DB19Cbt2`
		`- U+lqbgtVw4xI915hyyC1NRT3w/ImfJLikpDpzXLpmbJCOMYj0J7qkTFPsPXBLMx/fDi8`
		`- Ctg2koPP9m5EG4cAEIacP85/2vee28uKUFbdeB/B8DIsSIQYWGskfMNaqv2NOvW9O4Fj`
		`- qyhK2YEImZY2KK3xW48LAtPW/oqqvfmtYmJn40otnhiU6eErtS71NJmccE1lca4P7xil`
		`- dtz0Rqc3C8iTH8eayxAeT7xD4AFZznehPPWbMxK3C5kecZ8bnceNw5cmQqfvQRmR0yGB bNKA==;`
		`- dara=google.com`
		`- ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain`
		`- of qemu-devel-bounces+rjones=redhat.com@nongnu.org designates 209.51.188.17`
		`- as permitted sender)`
		`- smtp.mailfrom="qemu-devel-bounces+rjones=redhat.com@nongnu.org"`
		`- Return-Path: <qemu-devel-bounces+rjones=redhat.com@nongnu.org>`
		`- Received: from us-smtp-inbound-delivery-1.mimecast.com`
		`- (us-smtp-delivery-1.mimecast.com. [205.139.110.120]) by mx.google.com with`
		`- ESMTPS id`
		`- m9-20020ac86889000000b0042c2147b5d1si8208493qtq.474.2024.02.20.06.14.44 for`
		`- <rjones@gapps.redhat.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384`
		`- bits=256/256); Tue, 20 Feb 2024 06:14:45 -0800 (PST)`
		`- Received-SPF: pass (google.com: domain of`
		`- qemu-devel-bounces+rjones=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+rjones=redhat.com@nongnu.org designates 209.51.188.17 as`
		`- permitted sender)`
		`- smtp.mailfrom="qemu-devel-bounces+rjones=redhat.com@nongnu.org"`
		`- Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com`
		`- [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS`
		`- (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id`
		`- us-mta-656-0vwFszxbMwexl4X3OxB3MQ-1; Tue, 20 Feb 2024 09:14:43 -0500`
		`- X-MC-Unique: 0vwFszxbMwexl4X3OxB3MQ-1`
		`- Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com`
		`- [10.11.54.3]) (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 mimecast-mx02.redhat.com`
		`- (Postfix) with ESMTPS id 792F8863732 for <rjones@gapps.redhat.com>; Tue, 20`
		`- Feb 2024 14:14:43 +0000 (UTC)`
		`- Received: by smtp.corp.redhat.com (Postfix) id 761ED11422B9; Tue, 20 Feb 2024`
		`- 14:14:43 +0000 (UTC)`
		`- Delivered-To: rjones@redhat.com`
		`- Received: from mimecast-mx02.redhat.com`
		`- (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by`
		`- smtp.corp.redhat.com (Postfix) with ESMTPS id 3BBF311422B4 for`
		`- <rjones@redhat.com>; Tue, 20 Feb 2024 14:14:43 +0000 (UTC)`
		`- Received: from us-smtp-inbound-delivery-1.mimecast.com`
		`- (us-smtp-delivery-1.mimecast.com [207.211.31.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1EC691C54037 for`
		`- <rjones@redhat.com>; Tue, 20 Feb 2024 14:14:43 +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-467-K7PF_hWUMIuYn6nNX_NhGQ-1; Tue, 20 Feb 2024 09:14:41 -0500`
		`- X-MC-Unique: K7PF_hWUMIuYn6nNX_NhGQ-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`
		`- 1rcQsH-00027z-CN; Tue, 20 Feb 2024 09:13:33 -0500`
		`- 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`
		`- <michael.vogt@gmail.com>) id 1rcNp8-0004k1-C7 for qemu-devel@nongnu.org; Tue,`
		`- 20 Feb 2024 05:58:06 -0500`
		`- Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by`
		`- eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim`
		`- 4.90_1) (envelope-from <michael.vogt@gmail.com>) id 1rcNp6-0004zw-Uh for`
		`- qemu-devel@nongnu.org; Tue, 20 Feb 2024 05:58:06 -0500`
		`- Received: by mail-wm1-x32a.google.com with SMTP id`
		`- 5b1f17b1804b1-412698cdd77so8973055e9.1 for <qemu-devel@nongnu.org>; Tue, 20`
		`- Feb 2024 02:58:04 -0800 (PST)`
		`- X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net;`
		`- s=20230601; t=1708426683; x=1709031483;`
		`- 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=uNCdCIQzg/12W/RrXAVFQ1Isw/BMjvNQW4Y14ZuF5vg=;`
		`- b=anLCtG+2+69Viw2YFg93vXg3ZBx/82tUVKrUPKG0+3CgiM2BmSukRsME1L+upQkYAV`
		`- Llc9ODBvHts9RRZU1MeybdSSRMnAHrXrIJ6HZP30K1cHOxyXB7DOp27hCfOelFBBffpM`
		`- IVwjaKn+XnJ95IUMwMrhZ2T5Mcicw8tbRkCyDQwqrIpfpGWpOEq2HkEbe9T6z143sCBZ`
		`- XYDpDvFRQauxu+SUoVeQjDxt1gm0XHFzwdGH/QjQ/2YDwkkB/yUtlaDHgXafwnzwow/8`
		`- uHvdTZ9neIWDCUHEiHqRg9tHudOy1VhxH6T4jxzakzyTEit+mh2qB05/Yg2brj+hBo1u SaDg==`
		`- X-Gm-Message-State: AOJu0YxyvxpfZhEbdDWqHqfThgFNUwkmqMXvDaxwAQH7HqdpGm5oVEbJ`
		`- rzstVAif1eTUKOE4NOnCiMyJ9q/vEtd63Er7imeDi7lVutB0bby6fZFsj8mI`
		`- X-Received: by 2002:a05:600c:4f43:b0:411:e86d:85a3 with SMTP id`
		`- m3-20020a05600c4f4300b00411e86d85a3mr16304898wmq.16.1708426682414; Tue, 20`
		`- Feb 2024 02:58:02 -0800 (PST)`
		`- Received: from top.fritz.box (p5dd94bc2.dip0.t-ipconnect.de. [93.217.75.194])`
		`- by smtp.gmail.com with ESMTPSA id`
		`- co18-20020a0560000a1200b0033d4c3b0beesm7032427wrb.19.2024.02.20.02.58.01`
		`- (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024`
		`- 02:58:02 -0800 (PST)`
		`- From: Michael Vogt <michael.vogt@gmail.com>`
		`- To: qemu-devel@nongnu.org`
		`- Cc: Michael Vogt <michael.vogt@gmail.com>`
		`- Subject: [PATCH] linux-user: Add FIFREEZE and FITHAW ioctls`
		`- Date: Tue, 20 Feb 2024 11:57:21 +0100`
		`- Message-ID: <20240220105726.8852-1-michael.vogt@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,`
		`- T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no`
		`- X-Spam_action: no action`
		`- X-Mailman-Approved-At: Tue, 20 Feb 2024 09:13:26 -0500`
		`- 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+rjones=redhat.com@nongnu.org`
		`- Sender: qemu-devel-bounces+rjones=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.4.1 on 10.11.54.3`
		`- 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: 1327`
		`- Lines: 42`
		`-`
		`- Add missing FIFREEZE and FITHAW ioctls.`
		`-`
		`- Signed-off-by: Michael Vogt <michael.vogt@gmail.com>`
		`- ---`
		`- linux-user/ioctls.h \| 6 ++++++`
		`- linux-user/syscall_defs.h \| 3 +++`
		`- 2 files changed, 9 insertions(+)`
		`-`
		`- diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h`
		`- index 071f7ca253..1aec9d5836 100644`
		`- --- a/linux-user/ioctls.h`
		`- +++ b/linux-user/ioctls.h`
		`- @@ -134,6 +134,12 @@`
		`- IOCTL(FICLONE, IOC_W, TYPE_INT)`
		`- IOCTL(FICLONERANGE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_file_clone_range)))`
		`- #endif`
		`- +#ifdef FIFREEZE`
		`- + IOCTL(FIFREEZE, IOC_W \| IOC_R, TYPE_INT)`
		`- +#endif`
		`- +#ifdef FITHAW`
		`- + IOCTL(FITHAW, IOC_W \| IOC_R, TYPE_INT)`
		`- +#endif`
		`-`
		`- IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_LONG))`
		`- #ifdef CONFIG_FIEMAP`
		`- diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h`
		`- index 77ba343c85..744fda599e 100644`
		`- --- a/linux-user/syscall_defs.h`
		`- +++ b/linux-user/syscall_defs.h`
		`- @@ -943,6 +943,9 @@ struct target_rtc_pll_info {`
		`- #define TARGET_FICLONE TARGET_IOW(0x94, 9, abi_int)`
		`- #define TARGET_FICLONERANGE TARGET_IOW(0x94, 13, struct file_clone_range)`
		`-`
		`- +#define TARGET_FIFREEZE TARGET_IOWR('X', 119, abi_int)`
		`- +#define TARGET_FITHAW TARGET_IOWR('X', 120, abi_int)`
		`- +`
		`- /*`
		`- * Note that the ioctl numbers for FS_IOC_<GET\|SET><FLAGS\|VERSION>`
		`- * claim type "long" but the actual type used by the kernel is "int".`
		`- --`
		`- 2.43.0`
		`-`
		`-`

qemu.spec

file modified

+164 -84

		`@@ -11,17 +11,20 @@`
		`%global usbredir_version 0.7.1`
		`%global ipxe_version 20200823-5.git4bd064de`

		`+ %define have_vmsr_helper 0`
		`%global have_memlock_limits 0`
		`%global need_qemu_kvm 0`
		`%ifarch %{ix86}`
		`%global kvm_package system-x86`
		`# need_qemu_kvm should only ever be used by x86`
		`%global need_qemu_kvm 1`
		`+ %define have_vmsr_helper 1`
		`%endif`
		`%ifarch x86_64`
		`%global kvm_package system-x86`
		`# need_qemu_kvm should only ever be used by x86`
		`%global need_qemu_kvm 1`
		`+ %define have_vmsr_helper 1`
		`%endif`
		`%ifarch %{power64}`
		`%global have_memlock_limits 1`
		`@@ -76,6 +79,7 @@`
		`%global have_spice 0`
		`%endif`
		`%if 0%{?rhel} >= 9`
		`+ # TODO(Hyperscale): enable when RHBZ#2233161 is resolved`
		`%global have_spice 0`
		`%endif`

		`@@ -88,7 +92,7 @@`
		`%endif`

		`%global have_liburing 0`
		`- %if 0%{?fedora}`
		`+ %if 0%{?fedora} \|\| 0%{?centos_hs}`
		`%ifnarch %{arm}`
		`%global have_liburing 1`
		`%endif`
		`@@ -109,7 +113,7 @@`

		`%global have_jack 1`
		`%if 0%{?rhel}`
		`- %global have_jack 0`
		`+ %global have_jack %{defined centos_hs}`
		`%endif`

		`%global have_dbus_display 1`
		`@@ -118,10 +122,7 @@`
		`%global have_dbus_display 0`
		`%endif`

		`- %global have_libblkio 0`
		`- %if 0%{?fedora} >= 37`
		`%global have_libblkio 1`
		`- %endif`

		`%global have_gvnc_devel %{defined fedora}`
		`%global have_sdl_image %{defined fedora}`
		`@@ -133,7 +134,7 @@`

		`# Matches edk2.spec ExclusiveArch`
		`%global have_edk2 0`
		`- %ifarch %{ix86} x86_64 %{arm} aarch64`
		`+ %ifarch %{ix86} x86_64 %{arm} aarch64 riscv64`
		`%global have_edk2 1`
		`%endif`

		`@@ -150,7 +151,7 @@`
		`%endif`

		`%define have_block_nfs 0`
		`- %if 0%{?fedora}`
		`+ %if 0%{?fedora} \|\| 0%{?centos_hs}`
		`%define have_block_nfs 1`
		`%endif`

		`@@ -160,7 +161,7 @@`
		`%endif`

		`%define have_libcacard 1`
		`- %if 0%{?rhel} >= 9`
		`+ %if 0%{?rhel} >= 9 && ! 0%{?centos_hs}`
		`%define have_libcacard 0`
		`%endif`

		`@@ -227,7 +228,6 @@`
		`%define requires_device_display_virtio_gpu_pci Requires: %{name}-device-display-virtio-gpu-pci = %{evr}`
		`%define requires_device_display_virtio_gpu_ccw Requires: %{name}-device-display-virtio-gpu-ccw = %{evr}`
		`%define requires_device_display_virtio_vga Requires: %{name}-device-display-virtio-vga = %{evr}`
		`- %define requires_device_display_virtio_vga_gl Requires: %{name}-device-display-virtio-vga-gl = %{evr}`
		`%define requires_package_qemu_pr_helper Requires: qemu-pr-helper`
		`%ifnarch %{ix86}`
		`%if 0%{?fedora} \|\| 0%{?rhel} > 9`
		`@@ -245,10 +245,12 @@`
		`%define requires_device_display_vhost_user_gpu Requires: %{name}-device-display-vhost-user-gpu = %{evr}`
		`%define requires_device_display_virtio_gpu_gl Requires: %{name}-device-display-virtio-gpu-gl = %{evr}`
		`%define requires_device_display_virtio_gpu_pci_gl Requires: %{name}-device-display-virtio-gpu-pci-gl = %{evr}`
		`+ %define requires_device_display_virtio_vga_gl Requires: %{name}-device-display-virtio-vga-gl = %{evr}`
		`%else`
		`%define requires_device_display_vhost_user_gpu %{nil}`
		`%define requires_device_display_virtio_gpu_gl %{nil}`
		`%define requires_device_display_virtio_gpu_pci_gl %{nil}`
		`+ %define requires_device_display_virtio_vga_gl %{nil}`
		`%endif`

		`%if %{have_rutabaga_gfx}`
		`@@ -349,12 +351,14 @@`
		`Obsoletes: %{name}-system-lm32-core <= %{epoch}:%{version}-%{release} \`
		`Obsoletes: %{name}-system-moxie <= %{epoch}:%{version}-%{release} \`
		`Obsoletes: %{name}-system-moxie-core <= %{epoch}:%{version}-%{release} \`
		`+ Obsoletes: %{name}-system-nios2 <= %{epoch}:%{version}-%{release} \`
		`+ Obsoletes: %{name}-system-nios2-core <= %{epoch}:%{version}-%{release} \`
		`Obsoletes: %{name}-system-unicore32 <= %{epoch}:%{version}-%{release} \`
		`Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \`
		`Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38`

		`# Release candidate version tracking`
		`- #global rcver rc2`
		`+ # global rcver rc4`
		`%if 0%{?rcver:1}`
		`%global rcrel .%{rcver}`
		`%global rcstr -%{rcver}`
		`@@ -363,10 +367,13 @@`
		`# To prevent rpmdev-bumpspec breakage`
		`%global baserelease 1`

		`+ # Hyperscale release`
		`+ %global hsrel .1`
		`+`
		`Summary: QEMU is a FAST! processor emulator`
		`Name: qemu`
		`- Version: 8.2.2`
		`- Release: %{baserelease}%{?rcrel}%{?dist}`
		`+ Version: 9.1.0`
		`+ Release: %{baserelease}%{?rcrel}%{?hsrel}%{?dist}`
		`Epoch: 2`
		`License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-3.0`
		`URL: http://www.qemu.org/`
		`@@ -377,20 +384,33 @@`
		`Source1: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz.sig`
		`Source2: gpgkey-CEACC9E15534EBABB82D3FA03353C9CEF108B584.gpg`

		`- # Fix pvh.img ld build failure on fedora rawhide`
		`- # Not yet submitted upstream in this form. Original attempt is here:`
		`- # https://patchwork.kernel.org/project/qemu-devel/patch/20231128143647.847668-1-crobinso@redhat.com/`
		`- Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch`
		`+ # qemu 9.0.0 errors with:`
		`+ # RPM build errors:`
		`+ # Missing build-id in /tmp/rpmbuild/BUILDROOT/qemu-9.0.0-1.rc2.fc41.x86_64/usr/share/qemu/hppa-firmware.img`
		`+ # Missing build-id in /tmp/rpmbuild/BUILDROOT/qemu-9.0.0-1.rc2.fc41.x86_64/usr/share/qemu/hppa-firmware64.img`
		`+ # Generating build-id links failed`
		`+ %global _missing_build_ids_terminate_build 0`
		`+`
		`+ # fb-only patches.`
		`+ %if 0%{?facebook}`
		`+ # internal hack #1: skip validation of all CA certs in the provided bundle including`
		`+ # those not in the chain of trust. evaluating rework for potential upstreaming.`
		`+ Patch: 0001-relax-CA-certs-checks.patch`

		`- # Fix user-emulation of FIFREEZE and FITHAW ioctls`
		`- # Posted upstream 20-02-2024`
		`- # https://lists.nongnu.org/archive/html/qemu-devel/2024-02/msg03971.html`
		`- Patch: qemu-fifreeze-fithaw.patch`
		`+ # internal hack #2: when using qemu-user from binfmt_misc we cannot pass parameters to select`
		`+ # which cpu to use. changing the default to use the oldest cpu supported by CentOS 9.`
		`+ # evaluating if an environment variable could be used for this`
		`+ Patch: 0003-linux-user-default-cpu-model.patch`

		`- # ppc/spapr: Initialize max_cpus limit to SPAPR_IRQ_NR_IPIS`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=2265982`
		`- Patch: https://github.com/qemu/qemu/commit/2df5c1f5b014126595a26c6797089d284a3b211c.patch`
		`- Patch: https://github.com/qemu/qemu/commit/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch`
		`+ # Add new btrfs *_v2 ioctls for user-level emulation.`
		`+ # will be reworked for potential upstreaming.`
		`+ Patch: 0004-BTRFS_V2_IOCTLS.patch`
		`+`
		`+ # Include experimental change based AMD patches for SEV/SNP to make PCI passthrough`
		`+ # work with SNP`
		`+ Patch: 0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch`
		`+`
		`+ %endif`

		`Source10: qemu-guest-agent.service`
		`Source11: 99-qemu-guest-agent.rules`
		`@@ -403,6 +423,10 @@`
		`Source31: kvm-x86.conf`
		`Source36: README.tests`

		`+ # Skip failing test in copr`
		`+ # https://gitlab.com/qemu-project/qemu/-/issues/2541`
		`+ Patch: 0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch`
		`+`
		`BuildRequires: gnupg2`
		`BuildRequires: meson >= %{meson_version}`
		`BuildRequires: bison`
		`@@ -432,6 +456,7 @@`
		`# We need both because the 'stap' binary is probed for by configure`
		`BuildRequires: systemtap`
		`BuildRequires: systemtap-sdt-devel`
		`+ BuildRequires: /usr/bin/dtrace`
		`# For VNC PNG support`
		`BuildRequires: libpng-devel`
		`# For virtiofs`
		`@@ -567,14 +592,17 @@`
		`%if %{have_rutabaga_gfx}`
		`BuildRequires: rutabaga-gfx-ffi-devel`
		`%endif`
		`+ %if 0%{?rhel} <= 9`
		`+ # Builds on centos-stream 9 require python-tomli`
		`+ BuildRequires: python-tomli`
		`+ %endif`

		`%if %{user_static}`
		`- BuildRequires: glibc-static glib2-static zlib-static`
		`- %if 0%{?fedora} >= 37`
		`- BuildRequires: pcre2-static`
		`- %else`
		`- BuildRequires: pcre-static`
		`- %endif`
		`+ BuildRequires: glibc-static`
		`+ BuildRequires: glib2-static`
		`+ BuildRequires: zlib-static`
		`+ # -latomic added by GLib 2.81.0, 2024-06-28`
		`+ BuildRequires: libatomic-static`
		`%endif`


		`@@ -589,7 +617,6 @@`
		`Requires: %{name}-system-m68k = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-system-microblaze = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-system-mips = %{epoch}:%{version}-%{release}`
		`- Requires: %{name}-system-nios2 = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-system-or1k = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-system-ppc = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-system-riscv = %{epoch}:%{version}-%{release}`
		`@@ -934,12 +961,14 @@`
		`%description device-display-virtio-vga`
		`This package provides the virtio-vga display device for QEMU.`

		`+ %if %{have_virgl}`
		`%package device-display-virtio-vga-gl`
		`Summary: QEMU virtio-vga-gl display device`
		`Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}`
		`Requires: %{name}-device-display-virtio-vga%{?_isa} = %{epoch}:%{version}-%{release}`
		`%description device-display-virtio-vga-gl`
		`This package provides the virtio-vga-gl display device for QEMU.`
		`+ %endif`

		`%if %{have_rutabaga_gfx}`
		`%package device-display-virtio-vga-rutabaga`
		`@@ -1079,7 +1108,6 @@`
		`Requires: qemu-user-static-m68k`
		`Requires: qemu-user-static-microblaze`
		`Requires: qemu-user-static-mips`
		`- Requires: qemu-user-static-nios2`
		`Requires: qemu-user-static-or1k`
		`Requires: qemu-user-static-ppc`
		`Requires: qemu-user-static-riscv`
		`@@ -1088,6 +1116,8 @@`
		`Requires: qemu-user-static-sparc`
		`Requires: qemu-user-static-x86`
		`Requires: qemu-user-static-xtensa`
		`+ Obsoletes: qemu-user-static-nios2 <= %{epoch}:%{version}-%{release}`
		`+`

		`%description user-static`
		`This package provides the user mode emulation of qemu targets built as`
		`@@ -1153,12 +1183,6 @@`
		`This package provides the mips user mode emulation of qemu targets built as`
		`static binaries`

		`- %package user-static-nios2`
		`- Summary: QEMU user mode emulation of nios2 qemu targets static build`
		`- %description user-static-nios2`
		`- This package provides the nios2 user mode emulation of qemu targets built as`
		`- static binaries`
		`-`
		`%package user-static-or1k`
		`Summary: QEMU user mode emulation of or1k qemu targets static build`
		`%description user-static-or1k`
		`@@ -1355,20 +1379,6 @@`
		`This package provides the QEMU system emulator for MIPS systems.`


		`- %package system-nios2`
		`- Summary: QEMU system emulator for nios2`
		`- Requires: %{name}-system-nios2-core = %{epoch}:%{version}-%{release}`
		`- %{requires_all_modules}`
		`- %description system-nios2`
		`- This package provides the QEMU system emulator for NIOS2.`
		`-`
		`- %package system-nios2-core`
		`- Summary: QEMU system emulator for nios2`
		`- Requires: %{name}-common = %{epoch}:%{version}-%{release}`
		`- %description system-nios2-core`
		`- This package provides the QEMU system emulator for NIOS2.`
		`-`
		`-`
		`%package system-or1k`
		`Summary: QEMU system emulator for OpenRisc32`
		`Requires: %{name}-system-or1k-core = %{epoch}:%{version}-%{release}`
		`@@ -1410,6 +1420,9 @@`
		`%package system-riscv-core`
		`Summary: QEMU system emulator for RISC-V`
		`Requires: %{name}-common = %{epoch}:%{version}-%{release}`
		`+ %if %{have_edk2}`
		`+ Requires: edk2-riscv64`
		`+ %endif`
		`%description system-riscv-core`
		`This package provides the QEMU system emulator for RISC-V systems.`

		`@@ -1542,7 +1555,6 @@`
		`--disable-attr \\\`
		`--disable-auth-pam \\\`
		`--disable-avx2 \\\`
		`- --disable-avx512f \\\`
		`--disable-avx512bw \\\`
		`--disable-blkio \\\`
		`--disable-block-drv-whitelist-in-tools \\\`
		`@@ -1567,6 +1579,7 @@`
		`--disable-debug-graph-lock \\\`
		`--disable-debug-info \\\`
		`--disable-debug-mutex \\\`
		`+ --disable-debug-remap \\\`
		`--disable-debug-tcg \\\`
		`--disable-dmg \\\`
		`--disable-docs \\\`
		`@@ -1602,7 +1615,6 @@`
		`--disable-linux-aio \\\`
		`--disable-linux-io-uring \\\`
		`--disable-linux-user \\\`
		`- --disable-live-block-migration \\\`
		`--disable-lto \\\`
		`--disable-lzfse \\\`
		`--disable-lzo \\\`
		`@@ -1624,10 +1636,10 @@`
		`--disable-pipewire \\\`
		`--disable-pixman \\\`
		`--disable-plugins \\\`
		`- --disable-pvrdma \\\`
		`--disable-qcow1 \\\`
		`--disable-qed \\\`
		`--disable-qom-cast-debug \\\`
		`+ --disable-qpl \\\`
		`--disable-rbd \\\`
		`--disable-rdma \\\`
		`--disable-relocatable \\\`
		`@@ -1654,6 +1666,7 @@`
		`--disable-tools \\\`
		`--disable-tpm \\\`
		`--disable-tsan \\\`
		`+ --disable-uadk \\\`
		`--disable-u2f \\\`
		`--disable-usb-redir \\\`
		`--disable-user \\\`
		`@@ -1736,7 +1749,6 @@`
		`--enable-attr \`
		`%ifarch %{ix86} x86_64`
		`--enable-avx2 \`
		`- --enable-avx512f \`
		`--enable-avx512bw \`
		`%endif`
		`%if %{have_libblkio}`
		`@@ -1850,12 +1862,8 @@`
		`--enable-linux-io-uring \`
		`%endif`
		`--enable-linux-user \`
		`- --enable-live-block-migration \`
		`--enable-multiprocess \`
		`--enable-parallels \`
		`- %if %{have_librdma}`
		`- --enable-pvrdma \`
		`- %endif`
		`--enable-qcow1 \`
		`--enable-qed \`
		`--enable-qom-cast-debug \`
		`@@ -1982,6 +1990,12 @@`
		`install -m 0644 contrib/systemd/qemu-pr-helper.service %{buildroot}%{_unitdir}`
		`install -m 0644 contrib/systemd/qemu-pr-helper.socket %{buildroot}%{_unitdir}`

		`+ %if %{have_vmsr_helper}`
		`+ # Install qemu-vmsr-helper service`
		`+ install -m 0644 contrib/systemd/qemu-vmsr-helper.service %{buildroot}%{_unitdir}`
		`+ install -m 0644 contrib/systemd/qemu-vmsr-helper.socket %{buildroot}%{_unitdir}`
		`+ %endif`
		`+`
		`%if %{have_memlock_limits}`
		`install -D -p -m 644 %{_sourcedir}/95-kvm-memlock.conf %{buildroot}%{_sysconfdir}/security/limits.d/95-kvm-memlock.conf`
		`%endif`
		`@@ -2231,11 +2245,6 @@`
		`%postun user-static-mips`
		`/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null \|\| :`

		`- %post user-static-nios2`
		`- /bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null \|\| :`
		`- %postun user-static-nios2`
		`- /bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null \|\| :`
		`-`
		`%post user-static-or1k`
		`/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null \|\| :`
		`%postun user-static-or1k`
		`@@ -2292,6 +2301,19 @@`
		`%{_mandir}/man1/qemu-storage-daemon.1*`
		`%{_mandir}/man7/qemu-storage-daemon-qmp-ref.7*`

		`+ %{_datadir}/systemtap/tapset/qemu-img.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-img-log.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-img-simpletrace.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-io.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-io-log.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-io-simpletrace.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-nbd.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-nbd-log.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-nbd-simpletrace.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-storage-daemon.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-storage-daemon-log.stp`
		`+ %{_datadir}/systemtap/tapset/qemu-storage-daemon-simpletrace.stp`
		`+`

		`%files -n qemu-guest-agent`
		`%doc COPYING README.rst`
		`@@ -2322,8 +2344,11 @@`
		`%{_bindir}/qemu-edid`
		`%{_bindir}/qemu-trace-stap`
		`%{_datadir}/%{name}/simpletrace.py*`
		`+ %dir %{_datadir}/%{name}/tracetool/`
		`%{_datadir}/%{name}/tracetool/.py`
		`+ %dir %{_datadir}/%{name}/tracetool/backend/`
		`%{_datadir}/%{name}/tracetool/backend/.py`
		`+ %dir %{_datadir}/%{name}/tracetool/format/`
		`%{_datadir}/%{name}/tracetool/format/.py`
		`%{_datadir}/%{name}/dump-guest-memory.py*`
		`%{_datadir}/%{name}/trace-events-all`
		`@@ -2344,6 +2369,7 @@`
		`%{_datadir}/%{name}/keymaps/`
		`%{_datadir}/%{name}/linuxboot_dma.bin`
		`%attr(4755, -, -) %{_libexecdir}/qemu-bridge-helper`
		`+ %dir %{_libdir}/%{name}/`
		`%{_mandir}/man1/%{name}.1*`
		`%{_mandir}/man7/qemu-block-drivers.7*`
		`%{_mandir}/man7/qemu-cpu-models.7*`
		`@@ -2462,8 +2488,10 @@`
		`%{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so`
		`%files device-display-virtio-vga`
		`%{_libdir}/%{name}/hw-display-virtio-vga.so`
		`+ %if %{have_virgl}`
		`%files device-display-virtio-vga-gl`
		`%{_libdir}/%{name}/hw-display-virtio-vga-gl.so`
		`+ %endif`
		`%if %{have_rutabaga_gfx}`
		`%files device-display-virtio-vga-rutabaga`
		`%{_libdir}/%{name}/hw-display-virtio-vga-rutabaga.so`
		`@@ -2528,7 +2556,6 @@`
		`%{_bindir}/qemu-mips64el`
		`%{_bindir}/qemu-mipsn32`
		`%{_bindir}/qemu-mipsn32el`
		`- %{_bindir}/qemu-nios2`
		`%{_bindir}/qemu-or1k`
		`%{_bindir}/qemu-ppc`
		`%{_bindir}/qemu-ppc64`
		`@@ -2601,9 +2628,6 @@`
		`%{_datadir}/systemtap/tapset/qemu-mipsn32el.stp`
		`%{_datadir}/systemtap/tapset/qemu-mipsn32el-log.stp`
		`%{_datadir}/systemtap/tapset/qemu-mipsn32el-simpletrace.stp`
		`- %{_datadir}/systemtap/tapset/qemu-nios2.stp`
		`- %{_datadir}/systemtap/tapset/qemu-nios2-log.stp`
		`- %{_datadir}/systemtap/tapset/qemu-nios2-simpletrace.stp`
		`%{_datadir}/systemtap/tapset/qemu-or1k.stp`
		`%{_datadir}/systemtap/tapset/qemu-or1k-log.stp`
		`%{_datadir}/systemtap/tapset/qemu-or1k-simpletrace.stp`
		`@@ -2771,12 +2795,6 @@`
		`%{_exec_prefix}/lib/binfmt.d/qemu-mipsn32-static.conf`
		`%{_exec_prefix}/lib/binfmt.d/qemu-mipsn32el-static.conf`

		`- %files user-static-nios2`
		`- %{_bindir}/qemu-nios2-static`
		`- %{_datadir}/systemtap/tapset/qemu-nios2-log-static.stp`
		`- %{_datadir}/systemtap/tapset/qemu-nios2-simpletrace-static.stp`
		`- %{_datadir}/systemtap/tapset/qemu-nios2-static.stp`
		`-`
		`%files user-static-or1k`
		`%{_bindir}/qemu-or1k-static`
		`%{_datadir}/systemtap/tapset/qemu-or1k-log-static.stp`
		`@@ -2940,6 +2958,7 @@`
		`%{_datadir}/systemtap/tapset/qemu-system-hppa-simpletrace.stp`
		`%{_mandir}/man1/qemu-system-hppa.1*`
		`%{_datadir}/%{name}/hppa-firmware.img`
		`+ %{_datadir}/%{name}/hppa-firmware64.img`


		`%files system-loongarch64`
		`@@ -2999,15 +3018,6 @@`
		`%{_mandir}/man1/qemu-system-mips64.1*`


		`- %files system-nios2`
		`- %files system-nios2-core`
		`- %{_bindir}/qemu-system-nios2`
		`- %{_datadir}/systemtap/tapset/qemu-system-nios2.stp`
		`- %{_datadir}/systemtap/tapset/qemu-system-nios2-log.stp`
		`- %{_datadir}/systemtap/tapset/qemu-system-nios2-simpletrace.stp`
		`- %{_mandir}/man1/qemu-system-nios2.1*`
		`-`
		`-`
		`%files system-or1k`
		`%files system-or1k-core`
		`%{_bindir}/qemu-system-or1k`
		`@@ -3138,6 +3148,11 @@`
		`%{_bindir}/qemu-kvm`
		`%{_mandir}/man1/qemu-kvm.1*`
		`%endif`
		`+ %if %{have_vmsr_helper}`
		`+ %{_bindir}/qemu-vmsr-helper`
		`+ %{_unitdir}/qemu-vmsr-helper.service`
		`+ %{_unitdir}/qemu-vmsr-helper.socket`
		`+ %endif`


		`%files system-xtensa`
		`@@ -3157,6 +3172,56 @@`


		`%changelog`
		`+ * Wed Sep 11 2024 Roberto Campesato <render@metalabs.org> - 9.1.0-1.1`
		`+ - Merge latest changes from Fedora`
		`+ - Added fb-only patch based on experimental AMD changes for SEV/SNP`
		`+ to make PCI passthrough work with SNP`
		`+`
		`+ * Thu Sep 05 2024 Cole Robinson <crobinso@redhat.com> - 9.1.0-1`
		`+ - New release qemu 9.1.0 GA`
		`+`
		`+ * Thu Aug 29 2024 Cole Robinson <crobinso@redhat.com> - 9.1.0-0.3.rc4`
		`+ - New release qemu-9.1.0-rc4`
		`+`
		`+ * Mon Aug 26 2024 Cole Robinson <crobinso@redhat.com> - 9.1.0-0.2.rc3`
		`+ - New release qemu-9.1.0-rc3`
		`+`
		`+ * Tue Aug 20 2024 Cole Robinson <crobinso@redhat.com> - 9.1.0-0.1.rc2`
		`+ - New release qemu-9.1.0-rc2`
		`+`
		`+ * Mon Aug 05 2024 Cole Robinson <crobinso@redhat.com> - 2:9.0.0-5`
		`+ - Fix static builds with new glib2`
		`+ - Add libdir/qemu to qemu-common (bz 2283996)`
		`+`
		`+ * Mon Aug 05 2024 Richard W.M. Jones <rjones@redhat.com> - 2:9.0.0-4`
		`+ - Rebuild for Xen 4.19.0`
		`+`
		`+ * Mon Jul 22 2024 Lumír Balhar <lbalhar@redhat.com> - 2:9.0.0-3`
		`+ - Add new systemtap-sdt-dtrace to build deps`
		`+`
		`+ * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.0.0-2`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild`
		`+`
		`+ * Wed Apr 24 2024 Cole Robinson <crobinso@redhat.com> - 9.0.0-1`
		`+ - New release qemu 9.0.0 GA`
		`+`
		`+ * Tue Apr 23 2024 Cole Robinson <crobinso@redhat.com> - 9.0.0-0.1.rc4`
		`+ - New release qemu 9.0.0-rc4`
		`+`
		`+ * Sat Apr 06 2024 Cole Robinson <crobinso@redhat.com> - 8.2.2-2`
		`+ - Rebuild for new libiscsi`
		`+`
		`+ * Tue Mar 26 2024 Roberto Campesato <render@metalabs.org> - 8.2.2-1.1`
		`+ - include unit test change in patch relaxing CA cert bundle validation`
		`+`
		`+ * Tue Mar 19 2024 Roberto Campesato <render@metalabs.org> - 8.2.2-1.1`
		`+ - Merge latest changes from Fedora`
		`+ - Re-enabled libblkio (RHBZ#2232766 closed)`
		`+ - Added fb-only patches`
		`+ . relaxing CA cert bundle validatation`
		`+ . setting default cpu_model for linux-user x86_64 and aarch64`
		`+ . btrfs v2 ioctls`
		`+`
		`* Wed Mar 06 2024 Cole Robinson <crobinso@redhat.com> - 8.2.2-1`
		`- New release qemu 8.2.2`

		`@@ -3208,6 +3273,10 @@`
		`* Tue Sep 26 2023 Cole Robinson <crobinso@redhat.com> - 8.1.1-1`
		`- Rebase to qemu 8.1.1`

		`+ * Tue Sep 19 2023 Davide Cavalca <dcavalca@centosproject.org> - 2:8.1.0-2.1`
		`+ - Merge latest changes from Fedora`
		`+ - Enable libcacard support for Hyperscale builds`
		`+`
		`* Thu Aug 24 2023 Cole Robinson <crobinso@redhat.com> - 8.1.0-2`
		`- Make qemu-docs noarch`

		`@@ -3220,6 +3289,13 @@`
		`* Sun Aug 20 2023 Cole Robinson <crobinso@redhat.com> - 8.1.0-0.1-rc4`
		`- Rebase to qemu 8.1.0-rc4`

		`+ * Thu Aug 17 2023 Davide Cavalca <dcavalca@centosproject.org> - 2:8.0.3-1.1`
		`+ - Merge latest changes from Fedora`
		`+ - Temporarily disable virgl for Hyperscale due to missing dependencies`
		`+ - Adjust Requires for virtiofsd for RHEL 9 and earlier`
		`+ Upstream PR: https://src.fedoraproject.org/rpms/qemu/pull-request/47`
		`+ - Enable jack support for Hyperscale builds`
		`+`
		`* Thu Jul 20 2023 Camilla Conte <cconte@redhat.com> - 2:8.0.3-1`
		`- New upstream release 8.0.3`

		`@@ -3269,6 +3345,10 @@`
		`* Fri Nov 11 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-4`
		`- Update libbpf dependency`

		`+ * Thu Sep 08 2022 Davide Cavalca <dcavalca@centosproject.org> - 7.1.0-3.1`
		`+ - Enable some additional features for Hyperscale`
		`+ - Number patches for compatibility with el8`
		`+`
		`* Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-3`
		`- Unconditionally enable capstone-devel`

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- SHA512 (qemu-8.2.2.tar.xz) = dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41`
		`- SHA512 (qemu-8.2.2.tar.xz.sig) = 2a2dac01cc8f1aff8fbc4e6bfd13d7dd80b7bf6505388c04605a76a27aff870e1520d9879a5781508e65d1feb74e8c036d9cd4f21ab1e35fb7a845c2d66476de`
		`+ SHA512 (qemu-9.1.0.tar.xz) = bf61d65e37945fa8ee8640712c719ace05164d86e6df700b98bdc5f79e0a8d5e8f85bd48e726edb62b2419db20673f63ec8b63a60393a914b09cb365621b35e2`
		`+ SHA512 (qemu-9.1.0.tar.xz.sig) = d63144ef6d666f9e107cefadebcf89ede67027303d8cc43217e8454133adb6e9740fcc5f8a29cc7e24f052d9e685c7fe361b6e094dd0d607a1ce9161f6ed3b59`

render commented 2 months ago

Pulled latest changes from rawhide
Included additional fb-only patch to add an experimental change based on AMD patches for SEV/SNP to make PCI passthrough work on VMs with SNP

tested local build on x86_64 / aarch64 and scratch build from the fork

dcavalca commented on line 527 of qemu.spec 2 months ago

You're missing a newline after this

dcavalca commented 2 months ago

Once this is merged we should push it to c10s-sig-hyperscale too and build the package for c10s tags as well.

19 new commits added

Merge remote-tracking branch 'upstream/rawhide' into qemu-hyperscale-9.1.0
New release qemu 9.1.0 GA
spec: Make virtio-vga-gl depend on have_virgl
New release qemu-9.1.0-rc4
Disable 9p `local` tests that fail on copr aarch64
New release qemu-9.1.0-rc3
New release qemu-9.1.0-rc2
qemu-9.0.0-5.fc41
Add %{_libdir}/qemu to qemu-common (bz 2283996)
Clean up -static BuildRequires
Require libatomic-static for new glib2-static
Rebuild for Xen 4.19.0
Add unowned directories for tracetool
Add new /usr/bin/dtrace to build deps
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
Add dependency on edk2-riscv64
New release qemu 9.0.0 GA
New release qemu-9.0.0-rc4
Rebuild for new libiscsi

2 months ago

render commented 2 months ago

You're missing a newline after this

Thanks for spotting this! Added the missing newline

render commented 2 months ago

Once this is merged we should push it to c10s-sig-hyperscale too and build the package for c10s tags as well.

Will do (same for libvirt)

render commented 2 months ago

Merged this manually because pagure was failing with "Your task failed: failed to write reference 'refs/heads/c9s-sig-hyperscale': a reference with that name already exists"

git fetch https://git.centos.org/rpms/qemu refs/pull/3/head && git merge FETCH_HEAD

Pull-Request has been closed by render

2 months ago

Metadata

Assignee

None

Tags

No Tags

Changes Summary 11

+49

file added

0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch

-52

file removed

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

+31

file added

0001-relax-CA-certs-checks.patch

+33

file added

0003-linux-user-default-cpu-model.patch

+123

file added

0004-BTRFS_V2_IOCTLS.patch

+53

file added

0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch

-82

file removed

2df5c1f5b014126595a26c6797089d284a3b211c.patch

-75

file removed

c4f91d7b7be76c47015521ab0109c6e998a369b0.patch

-210

file removed

qemu-fifreeze-fithaw.patch

rpms / qemu

Source Code

#3 Update to v9.1.0 for hyperscale release Closed 2 months ago by render. Opened 2 months ago by render. rpms/ render/qemu qemu-hyperscale-9.1.0 into c9s-sig-hyperscale

Metadata

Changes Summary 11

#3 Update to v9.1.0 for hyperscale release

Closed 2 months ago by render. Opened 2 months ago by render.

rpms/ render/qemu qemu-hyperscale-9.1.0 into c9s-sig-hyperscale