From 7d58afccfcfe4debe18dfe883b899d60d17e83ae Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Apr 06 2024 19:03:05 +0000 Subject: [PATCH 1/19] Rebuild for new libiscsi Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index c58042e..d41f0af 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,7 +361,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 1 +%global baserelease 2 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3157,6 +3157,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Sat Apr 06 2024 Cole Robinson - 8.2.2-2 +- Rebuild for new libiscsi + * Wed Mar 06 2024 Cole Robinson - 8.2.2-1 - New release qemu 8.2.2 From fa9ecd2d1ffaed335d676c9969443e245410b55b Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Apr 23 2024 13:01:13 +0000 Subject: [PATCH 2/19] New release qemu-9.0.0-rc4 Signed-off-by: Cole Robinson --- diff --git a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch deleted file mode 100644 index b699c10..0000000 --- a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 12cbd48e1e78f07b19df900b0f9ccdd633aa42ee Mon Sep 17 00:00:00 2001 -From: Cole Robinson -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 ---- - 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: diff --git a/2df5c1f5b014126595a26c6797089d284a3b211c.patch b/2df5c1f5b014126595a26c6797089d284a3b211c.patch deleted file mode 100644 index 9de4a50..0000000 --- a/2df5c1f5b014126595a26c6797089d284a3b211c.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 2df5c1f5b014126595a26c6797089d284a3b211c Mon Sep 17 00:00:00 2001 -From: Harsh Prateek Bora -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 -Reviewed-by: Cédric Le Goater -Tested-by: Kowshik Jois -Signed-off-by: Harsh Prateek Bora -Signed-off-by: Nicholas Piggin ---- - 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) diff --git a/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch b/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch deleted file mode 100644 index b37288b..0000000 --- a/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c4f91d7b7be76c47015521ab0109c6e998a369b0 Mon Sep 17 00:00:00 2001 -From: Harsh Prateek Bora -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 -Tested-by: Kowshik Jois -Reviewed-by: Cédric Le Goater -Signed-off-by: Harsh Prateek Bora -Signed-off-by: Nicholas Piggin ---- - 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 = ""; diff --git a/qemu-fifreeze-fithaw.patch b/qemu-fifreeze-fithaw.patch deleted file mode 100644 index 1d639a7..0000000 --- a/qemu-fifreeze-fithaw.patch +++ /dev/null @@ -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 (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: -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 - (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 ; 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 - ; 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 - ; 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 ) 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 - ) 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 ) 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 ; 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 -To: qemu-devel@nongnu.org -Cc: Michael Vogt -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: -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-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 ---- - 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_ - * claim type "long" but the actual type used by the kernel is "int". --- -2.43.0 - - diff --git a/qemu.spec b/qemu.spec index d41f0af..49efe80 100644 --- a/qemu.spec +++ b/qemu.spec @@ -354,18 +354,18 @@ 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} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 2 +%global baserelease 0.1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.2.2 +Version: 9.0.0 Release: %{baserelease}%{?rcrel}%{?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 @@ -377,20 +377,12 @@ Source0: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz 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 - -# 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 - -# 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 +# 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 Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules @@ -2292,6 +2284,19 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2940,6 +2945,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3157,6 +3163,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Apr 23 2024 Cole Robinson - 9.0.0-0.1.rc4 +- New release qemu 9.0.0-rc4 + * Sat Apr 06 2024 Cole Robinson - 8.2.2-2 - Rebuild for new libiscsi diff --git a/sources b/sources index 6517d45..0dc5138 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-8.2.2.tar.xz) = dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41 -SHA512 (qemu-8.2.2.tar.xz.sig) = 2a2dac01cc8f1aff8fbc4e6bfd13d7dd80b7bf6505388c04605a76a27aff870e1520d9879a5781508e65d1feb74e8c036d9cd4f21ab1e35fb7a845c2d66476de +SHA512 (qemu-9.0.0-rc4.tar.xz) = 691be20a69f3c364b541e99a33c2dfa86fb43cf70786c14662d59979311c70ecfdc50062ea121084874866aad82a307687eb52f6ba1f02ce331c1e679835e8a3 +SHA512 (qemu-9.0.0-rc4.tar.xz.sig) = fe9881f9bb0ec07712a578e50321fc02df1f92db23aaddd3ed41e808fe301e72e2688f4ae8f402c2a3123f34f017c8b062c714e26f9cdaf1399b63345b1cebe9 From bd268d19cc4283d73e0d8d343b31c096b30ded8d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Apr 24 2024 16:00:42 +0000 Subject: [PATCH 3/19] New release qemu 9.0.0 GA Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index 49efe80..e8dc55b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -354,14 +354,14 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -%global rcver rc4 +# global rcver rc4 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.1 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3163,6 +3163,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Apr 24 2024 Cole Robinson - 9.0.0-1 +- New release qemu 9.0.0 GA + * Tue Apr 23 2024 Cole Robinson - 9.0.0-0.1.rc4 - New release qemu 9.0.0-rc4 diff --git a/sources b/sources index 0dc5138..2a31e12 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-9.0.0-rc4.tar.xz) = 691be20a69f3c364b541e99a33c2dfa86fb43cf70786c14662d59979311c70ecfdc50062ea121084874866aad82a307687eb52f6ba1f02ce331c1e679835e8a3 -SHA512 (qemu-9.0.0-rc4.tar.xz.sig) = fe9881f9bb0ec07712a578e50321fc02df1f92db23aaddd3ed41e808fe301e72e2688f4ae8f402c2a3123f34f017c8b062c714e26f9cdaf1399b63345b1cebe9 +SHA512 (qemu-9.0.0.tar.xz) = 1603517cd4c93632ba60ad7261eb67374f12a744bf58f10b0e8686e46d3a02d8b6bf58a0c617f23a1868084aaba6386c24341894f75539e0b816091718721427 +SHA512 (qemu-9.0.0.tar.xz.sig) = b94259f56d7da92dd8df60bb9a328f7a275cdf2f7128c1e85039d894da8663d2b058ea4d275442ec80ac9c49fe91f30d489b3f3fc1f97bf845b9fe6851cf9191 From d364afeef72757cf781c85b589047489dd59f868 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: May 31 2024 16:17:11 +0000 Subject: [PATCH 4/19] Add dependency on edk2-riscv64 It's part of Fedora, it works fine and in fact many recent guest images expect to be booted via UEFI. Signed-off-by: Andrea Bolognani --- diff --git a/qemu.spec b/qemu.spec index e8dc55b..1257c55 100644 --- a/qemu.spec +++ b/qemu.spec @@ -133,7 +133,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 @@ -1402,6 +1402,9 @@ This package provides the QEMU system emulator for RISC-V systems. %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. From fd6b74bccc070bb06d0def08f662b85cd937ebfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 19 2024 17:34:22 +0000 Subject: [PATCH 5/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- diff --git a/qemu.spec b/qemu.spec index 1257c55..54a7526 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,7 +361,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 1 +%global baserelease 2 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3166,6 +3166,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2:9.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Apr 24 2024 Cole Robinson - 9.0.0-1 - New release qemu 9.0.0 GA From d5321c6ac07522d64d24f64d7cb2c1e79fb2c732 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Jul 31 2024 09:22:02 +0000 Subject: [PATCH 6/19] Add new /usr/bin/dtrace to build deps This is a part of approved Fedora change: https://fedoraproject.org/wiki/Changes/Separate_dtrace_package systemtap-sdt-devel will stop requiring systemtap-sdt-dtrace and that would break the build of this package because systemtap-sdt-devel no longer provides /usr/bin/dtrace. --- diff --git a/qemu.spec b/qemu.spec index 54a7526..559ba38 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,7 +361,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 2 +%global baserelease 3 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -424,6 +424,7 @@ BuildRequires: librbd-devel # 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 @@ -3166,6 +3167,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Jul 22 2024 Lumír Balhar - 2:9.0.0-3 +- Add new systemtap-sdt-dtrace to build deps + * Fri Jul 19 2024 Fedora Release Engineering - 2:9.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5c2ab5c259331264a5cc9ddd0ca47c9ca0af67a3 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Aug 04 2024 09:03:38 +0000 Subject: [PATCH 7/19] Add unowned directories for tracetool Reported-by: Christoph Karl Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2302699 --- diff --git a/qemu.spec b/qemu.spec index 559ba38..df03bc1 100644 --- a/qemu.spec +++ b/qemu.spec @@ -2331,8 +2331,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 From 971e984a4ca190e22ba3e4a5df97e49296d84ff6 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Aug 05 2024 10:11:44 +0000 Subject: [PATCH 8/19] Rebuild for Xen 4.19.0 --- diff --git a/qemu.spec b/qemu.spec index df03bc1..a47dfab 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,7 +361,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 3 +%global baserelease 4 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3170,6 +3170,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Aug 05 2024 Richard W.M. Jones - 2:9.0.0-4 +- Rebuild for Xen 4.19.0 + * Mon Jul 22 2024 Lumír Balhar - 2:9.0.0-3 - Add new systemtap-sdt-dtrace to build deps From e46b6fe585b22f1bca91b637a80a6a6dd3c4f142 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 05 2024 17:44:29 +0000 Subject: [PATCH 9/19] Require libatomic-static for new glib2-static Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index a47dfab..a3789ec 100644 --- a/qemu.spec +++ b/qemu.spec @@ -563,6 +563,8 @@ BuildRequires: rutabaga-gfx-ffi-devel %if %{user_static} BuildRequires: glibc-static glib2-static zlib-static +# -latomic added by GLib 2.81.0, 2024-06-28 +BuildRequires: libatomic-static %if 0%{?fedora} >= 37 BuildRequires: pcre2-static %else From 5206b67dbc30a2b5bcc53c8f867bd925b5338459 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 05 2024 17:46:36 +0000 Subject: [PATCH 10/19] Clean up -static BuildRequires * Split them into individual lines * pcre2 is a transitive dep of glib2, which pulls it in for us Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index a3789ec..db471b1 100644 --- a/qemu.spec +++ b/qemu.spec @@ -562,14 +562,11 @@ BuildRequires: rutabaga-gfx-ffi-devel %endif %if %{user_static} -BuildRequires: glibc-static glib2-static zlib-static +BuildRequires: glibc-static +BuildRequires: glib2-static +BuildRequires: zlib-static # -latomic added by GLib 2.81.0, 2024-06-28 BuildRequires: libatomic-static -%if 0%{?fedora} >= 37 -BuildRequires: pcre2-static -%else -BuildRequires: pcre-static -%endif %endif From a2578065ffb1d86ac62a5f89336923591f4837be Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 05 2024 18:26:22 +0000 Subject: [PATCH 11/19] Add %{_libdir}/qemu to qemu-common (bz 2283996) Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index db471b1..aa39261 100644 --- a/qemu.spec +++ b/qemu.spec @@ -2355,6 +2355,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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* From 05f289c3f31a513c76849e6e7d52744e1587cae4 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 05 2024 18:28:42 +0000 Subject: [PATCH 12/19] qemu-9.0.0-5.fc41 Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index aa39261..d715056 100644 --- a/qemu.spec +++ b/qemu.spec @@ -361,7 +361,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 4 +%global baserelease 5 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3170,6 +3170,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Aug 05 2024 Cole Robinson - 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 - 2:9.0.0-4 - Rebuild for Xen 4.19.0 From 19dabf80136b9830f9995950a103bdf8d67f488a Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 20 2024 15:21:14 +0000 Subject: [PATCH 13/19] New release qemu-9.1.0-rc2 - Drop deprecated nios2 - Add qemu-vmsr-helper service to qemu-system-x86 Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index d715056..f9141b4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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 @@ -349,23 +352,25 @@ Obsoletes: %{name}-system-lm32 <= %{epoch}:%{version}-%{release} \ 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 rc4 +%global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 5 +%global baserelease 0.1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 9.0.0 +Version: 9.1.0 Release: %{baserelease}%{?rcrel}%{?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 @@ -581,7 +586,6 @@ Requires: %{name}-system-loongarch64 = %{epoch}:%{version}-%{release} 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} @@ -1071,7 +1075,6 @@ Requires: qemu-user-static-loongarch64 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 @@ -1080,6 +1083,8 @@ Requires: qemu-user-static-sh4 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 @@ -1145,12 +1150,6 @@ Summary: QEMU user mode emulation of mips qemu targets static build 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 @@ -1347,20 +1346,6 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} 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} @@ -1537,7 +1522,6 @@ mkdir -p %{static_builddir} --disable-attr \\\ --disable-auth-pam \\\ --disable-avx2 \\\ - --disable-avx512f \\\ --disable-avx512bw \\\ --disable-blkio \\\ --disable-block-drv-whitelist-in-tools \\\ @@ -1562,6 +1546,7 @@ mkdir -p %{static_builddir} --disable-debug-graph-lock \\\ --disable-debug-info \\\ --disable-debug-mutex \\\ + --disable-debug-remap \\\ --disable-debug-tcg \\\ --disable-dmg \\\ --disable-docs \\\ @@ -1597,7 +1582,6 @@ mkdir -p %{static_builddir} --disable-linux-aio \\\ --disable-linux-io-uring \\\ --disable-linux-user \\\ - --disable-live-block-migration \\\ --disable-lto \\\ --disable-lzfse \\\ --disable-lzo \\\ @@ -1619,10 +1603,10 @@ mkdir -p %{static_builddir} --disable-pipewire \\\ --disable-pixman \\\ --disable-plugins \\\ - --disable-pvrdma \\\ --disable-qcow1 \\\ --disable-qed \\\ --disable-qom-cast-debug \\\ + --disable-qpl \\\ --disable-rbd \\\ --disable-rdma \\\ --disable-relocatable \\\ @@ -1649,6 +1633,7 @@ mkdir -p %{static_builddir} --disable-tools \\\ --disable-tpm \\\ --disable-tsan \\\ + --disable-uadk \\\ --disable-u2f \\\ --disable-usb-redir \\\ --disable-user \\\ @@ -1731,7 +1716,6 @@ run_configure \ --enable-attr \ %ifarch %{ix86} x86_64 --enable-avx2 \ - --enable-avx512f \ --enable-avx512bw \ %endif %if %{have_libblkio} @@ -1845,12 +1829,8 @@ run_configure \ --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 \ @@ -1977,6 +1957,12 @@ install -D -m 0644 %{_sourcedir}/bridge.conf %{buildroot}%{_sysconfdir}/%{name}/ 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 @@ -2226,11 +2212,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %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 @@ -2540,7 +2521,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-mips64el %{_bindir}/qemu-mipsn32 %{_bindir}/qemu-mipsn32el -%{_bindir}/qemu-nios2 %{_bindir}/qemu-or1k %{_bindir}/qemu-ppc %{_bindir}/qemu-ppc64 @@ -2613,9 +2593,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2783,12 +2760,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3012,15 +2983,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3151,6 +3113,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3170,6 +3137,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Aug 20 2024 Cole Robinson - 9.1.0-0.1.rc2 +- New release qemu-9.1.0-rc2 + * Mon Aug 05 2024 Cole Robinson - 2:9.0.0-5 - Fix static builds with new glib2 - Add libdir/qemu to qemu-common (bz 2283996) diff --git a/sources b/sources index 2a31e12..44a7c36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-9.0.0.tar.xz) = 1603517cd4c93632ba60ad7261eb67374f12a744bf58f10b0e8686e46d3a02d8b6bf58a0c617f23a1868084aaba6386c24341894f75539e0b816091718721427 -SHA512 (qemu-9.0.0.tar.xz.sig) = b94259f56d7da92dd8df60bb9a328f7a275cdf2f7128c1e85039d894da8663d2b058ea4d275442ec80ac9c49fe91f30d489b3f3fc1f97bf845b9fe6851cf9191 +SHA512 (qemu-9.1.0-rc2.tar.xz) = 76a30e1ad92bf93316a64bee072df1853108beaa2181693b389b7bba6033e69515a6f3f89ea93e15d75e83422adc17d01c54df2cc95cb0c5bd2c7d25a80ded96 +SHA512 (qemu-9.1.0-rc2.tar.xz.sig) = f537cd26633c6c43d667e438a63601611b2c8831d6ae1493c0a44feb13fd5bb68183d64af77e092b931c747e15d3bbec1a581a92a980a130ba4791e80ca4986f From ed3c308c722fbf227551a0f9a9c6a2c0e8aa0a30 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 26 2024 17:13:47 +0000 Subject: [PATCH 14/19] New release qemu-9.1.0-rc3 Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index f9141b4..012167b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -359,14 +359,14 @@ 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 rc3 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.1 +%global baserelease 0.2 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -565,6 +565,10 @@ BuildRequires: libxdp-devel %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 @@ -3137,6 +3141,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Mon Aug 26 2024 Cole Robinson - 9.1.0-0.1.rc3 +- New release qemu-9.1.0-rc3 + * Tue Aug 20 2024 Cole Robinson - 9.1.0-0.1.rc2 - New release qemu-9.1.0-rc2 diff --git a/sources b/sources index 44a7c36..6b38f22 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-9.1.0-rc2.tar.xz) = 76a30e1ad92bf93316a64bee072df1853108beaa2181693b389b7bba6033e69515a6f3f89ea93e15d75e83422adc17d01c54df2cc95cb0c5bd2c7d25a80ded96 -SHA512 (qemu-9.1.0-rc2.tar.xz.sig) = f537cd26633c6c43d667e438a63601611b2c8831d6ae1493c0a44feb13fd5bb68183d64af77e092b931c747e15d3bbec1a581a92a980a130ba4791e80ca4986f +SHA512 (qemu-9.1.0-rc3.tar.xz) = 1083037ff879ceb7905f9495d384a7dbf9def1c82ff0f259cd05892de837cd6ad4b896a9b567ca07f16b5260445fdacd5504b17681cb835a3e75609558c86090 +SHA512 (qemu-9.1.0-rc3.tar.xz.sig) = 6ddd16fa7b45f8ec4666903d55646ea5a7baf9731e937bb0d29660bbd6d967fbe2e9ba95d322824ccc752cebec5152a240e3fa4ecbdb04abfdcafcc2cf622147 From 62fec653e46b3f03df2c76e7f1d33f86a11d8482 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 29 2024 14:05:12 +0000 Subject: [PATCH 15/19] Disable 9p `local` tests that fail on copr aarch64 Signed-off-by: Cole Robinson --- diff --git a/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch b/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch new file mode 100644 index 0000000..c1bbf76 --- /dev/null +++ b/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch @@ -0,0 +1,49 @@ +From 34acc8e0028bf059c9c4e725c653df56eac7c296 Mon Sep 17 00:00:00 2001 +Message-ID: <34acc8e0028bf059c9c4e725c653df56eac7c296.1724767601.git.crobinso@redhat.com> +From: Cole Robinson +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 +--- + 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 + diff --git a/qemu.spec b/qemu.spec index 012167b..ad80f30 100644 --- a/qemu.spec +++ b/qemu.spec @@ -400,6 +400,10 @@ Source30: kvm-s390x.conf 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 From 6ca1975319d11f2c6eb68dfdc43da1bbaaf3976d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 29 2024 14:05:12 +0000 Subject: [PATCH 16/19] New release qemu-9.1.0-rc4 Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index ad80f30..5511e3f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -359,14 +359,14 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -%global rcver rc3 +%global rcver rc4 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.2 +%global baserelease 0.3 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3145,7 +3145,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog -* Mon Aug 26 2024 Cole Robinson - 9.1.0-0.1.rc3 +* Thu Aug 29 2024 Cole Robinson - 9.1.0-0.3.rc4 +- New release qemu-9.1.0-rc4 + +* Mon Aug 26 2024 Cole Robinson - 9.1.0-0.2.rc3 - New release qemu-9.1.0-rc3 * Tue Aug 20 2024 Cole Robinson - 9.1.0-0.1.rc2 diff --git a/sources b/sources index 6b38f22..42d6d3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-9.1.0-rc3.tar.xz) = 1083037ff879ceb7905f9495d384a7dbf9def1c82ff0f259cd05892de837cd6ad4b896a9b567ca07f16b5260445fdacd5504b17681cb835a3e75609558c86090 -SHA512 (qemu-9.1.0-rc3.tar.xz.sig) = 6ddd16fa7b45f8ec4666903d55646ea5a7baf9731e937bb0d29660bbd6d967fbe2e9ba95d322824ccc752cebec5152a240e3fa4ecbdb04abfdcafcc2cf622147 +SHA512 (qemu-9.1.0-rc4.tar.xz) = 5b05233ac03a72727229706b64a2a8d393e8f897f5b7cb7615bbceeaa19fde4c08d39efdb989923d0b103a768cc24642460e2c1de644d95f75d3bb8cceefb1bc +SHA512 (qemu-9.1.0-rc4.tar.xz.sig) = 8747130258b4c4bd9dbdd4f1d6a2185950740c01d5eee3da4c8bfc93b93e80b385a05e884367498034d666cd29e5096337aa5dcd55a631beb37cca96e67017e0 From 5fde0b162760f151822b2e90bcd48fa8c2f43afe Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 29 2024 20:19:33 +0000 Subject: [PATCH 17/19] spec: Make virtio-vga-gl depend on have_virgl Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index 5511e3f..e0fee64 100644 --- a/qemu.spec +++ b/qemu.spec @@ -230,7 +230,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 @@ -248,10 +247,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} @@ -938,12 +939,14 @@ Requires: %{name}-device-display-virtio-gpu%{?_isa} = %{epoch}:%{version}-%{rele %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 @@ -2463,8 +2466,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 From 2d716294f1d614abbcaf7cbe06d17547d71f47ad Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sep 05 2024 17:49:58 +0000 Subject: [PATCH 18/19] New release qemu 9.1.0 GA Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index e0fee64..768c714 100644 --- a/qemu.spec +++ b/qemu.spec @@ -360,14 +360,14 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -%global rcver rc4 +# global rcver rc4 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.3 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -3150,6 +3150,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Thu Sep 05 2024 Cole Robinson - 9.1.0-1 +- New release qemu 9.1.0 GA + * Thu Aug 29 2024 Cole Robinson - 9.1.0-0.3.rc4 - New release qemu-9.1.0-rc4 diff --git a/sources b/sources index 42d6d3b..862f989 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qemu-9.1.0-rc4.tar.xz) = 5b05233ac03a72727229706b64a2a8d393e8f897f5b7cb7615bbceeaa19fde4c08d39efdb989923d0b103a768cc24642460e2c1de644d95f75d3bb8cceefb1bc -SHA512 (qemu-9.1.0-rc4.tar.xz.sig) = 8747130258b4c4bd9dbdd4f1d6a2185950740c01d5eee3da4c8bfc93b93e80b385a05e884367498034d666cd29e5096337aa5dcd55a631beb37cca96e67017e0 +SHA512 (qemu-9.1.0.tar.xz) = bf61d65e37945fa8ee8640712c719ace05164d86e6df700b98bdc5f79e0a8d5e8f85bd48e726edb62b2419db20673f63ec8b63a60393a914b09cb365621b35e2 +SHA512 (qemu-9.1.0.tar.xz.sig) = d63144ef6d666f9e107cefadebcf89ede67027303d8cc43217e8454133adb6e9740fcc5f8a29cc7e24f052d9e685c7fe361b6e094dd0d607a1ce9161f6ed3b59 From 01bd9b013a7c6d77a5489f048f57ab65faec258c Mon Sep 17 00:00:00 2001 From: Roberto Campesato Date: Sep 16 2024 14:20:13 +0000 Subject: [PATCH 19/19] Merge remote-tracking branch 'upstream/rawhide' into qemu-hyperscale-9.1.0 --- diff --git a/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch b/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch new file mode 100644 index 0000000..c1bbf76 --- /dev/null +++ b/0001-Disable-9p-local-tests-that-fail-on-copr-aarch64.patch @@ -0,0 +1,49 @@ +From 34acc8e0028bf059c9c4e725c653df56eac7c296 Mon Sep 17 00:00:00 2001 +Message-ID: <34acc8e0028bf059c9c4e725c653df56eac7c296.1724767601.git.crobinso@redhat.com> +From: Cole Robinson +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 +--- + 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 + diff --git a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch b/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch deleted file mode 100644 index b699c10..0000000 --- a/0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 12cbd48e1e78f07b19df900b0f9ccdd633aa42ee Mon Sep 17 00:00:00 2001 -From: Cole Robinson -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 ---- - 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: diff --git a/0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch b/0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch new file mode 100644 index 0000000..0e89ad5 --- /dev/null +++ b/0005-disable_ram_block_discard_for_pci_passthrough_on_AMD_SEV_SNP.patch @@ -0,0 +1,53 @@ +From: Roberto Campesato +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); diff --git a/2df5c1f5b014126595a26c6797089d284a3b211c.patch b/2df5c1f5b014126595a26c6797089d284a3b211c.patch deleted file mode 100644 index 9de4a50..0000000 --- a/2df5c1f5b014126595a26c6797089d284a3b211c.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 2df5c1f5b014126595a26c6797089d284a3b211c Mon Sep 17 00:00:00 2001 -From: Harsh Prateek Bora -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 -Reviewed-by: Cédric Le Goater -Tested-by: Kowshik Jois -Signed-off-by: Harsh Prateek Bora -Signed-off-by: Nicholas Piggin ---- - 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) diff --git a/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch b/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch deleted file mode 100644 index b37288b..0000000 --- a/c4f91d7b7be76c47015521ab0109c6e998a369b0.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c4f91d7b7be76c47015521ab0109c6e998a369b0 Mon Sep 17 00:00:00 2001 -From: Harsh Prateek Bora -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 -Tested-by: Kowshik Jois -Reviewed-by: Cédric Le Goater -Signed-off-by: Harsh Prateek Bora -Signed-off-by: Nicholas Piggin ---- - 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 = ""; diff --git a/qemu-fifreeze-fithaw.patch b/qemu-fifreeze-fithaw.patch deleted file mode 100644 index 1d639a7..0000000 --- a/qemu-fifreeze-fithaw.patch +++ /dev/null @@ -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 (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: -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 - (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 ; 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 - ; 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 - ; 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 ) 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 - ) 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 ) 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 ; 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 -To: qemu-devel@nongnu.org -Cc: Michael Vogt -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: -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-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 ---- - 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_ - * claim type "long" but the actual type used by the kernel is "int". --- -2.43.0 - - diff --git a/qemu.spec b/qemu.spec index 405ff8e..35f7768 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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 @@ -131,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 @@ -225,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 @@ -243,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} @@ -347,12 +351,14 @@ Obsoletes: %{name}-system-lm32 <= %{epoch}:%{version}-%{release} \ 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} @@ -366,7 +372,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 8.2.2 +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 @@ -378,20 +384,12 @@ Source0: %{dlurl}/%{name}-%{version}%{?rcstr}.tar.xz 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 - -# 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 - -# 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 +# 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} @@ -407,6 +405,11 @@ Patch: 0003-linux-user-default-cpu-model.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 @@ -420,6 +423,10 @@ Source30: kvm-s390x.conf 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 @@ -449,6 +456,7 @@ BuildRequires: librbd-devel # 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 @@ -584,14 +592,17 @@ BuildRequires: libxdp-devel %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 @@ -606,7 +617,6 @@ Requires: %{name}-system-loongarch64 = %{epoch}:%{version}-%{release} 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} @@ -951,12 +961,14 @@ Requires: %{name}-device-display-virtio-gpu%{?_isa} = %{epoch}:%{version}-%{rele %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 @@ -1096,7 +1108,6 @@ Requires: qemu-user-static-loongarch64 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 @@ -1105,6 +1116,8 @@ Requires: qemu-user-static-sh4 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 @@ -1170,12 +1183,6 @@ Summary: QEMU user mode emulation of mips qemu targets static build 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 @@ -1372,20 +1379,6 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} 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} @@ -1427,6 +1420,9 @@ This package provides the QEMU system emulator for RISC-V systems. %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. @@ -1559,7 +1555,6 @@ mkdir -p %{static_builddir} --disable-attr \\\ --disable-auth-pam \\\ --disable-avx2 \\\ - --disable-avx512f \\\ --disable-avx512bw \\\ --disable-blkio \\\ --disable-block-drv-whitelist-in-tools \\\ @@ -1584,6 +1579,7 @@ mkdir -p %{static_builddir} --disable-debug-graph-lock \\\ --disable-debug-info \\\ --disable-debug-mutex \\\ + --disable-debug-remap \\\ --disable-debug-tcg \\\ --disable-dmg \\\ --disable-docs \\\ @@ -1619,7 +1615,6 @@ mkdir -p %{static_builddir} --disable-linux-aio \\\ --disable-linux-io-uring \\\ --disable-linux-user \\\ - --disable-live-block-migration \\\ --disable-lto \\\ --disable-lzfse \\\ --disable-lzo \\\ @@ -1641,10 +1636,10 @@ mkdir -p %{static_builddir} --disable-pipewire \\\ --disable-pixman \\\ --disable-plugins \\\ - --disable-pvrdma \\\ --disable-qcow1 \\\ --disable-qed \\\ --disable-qom-cast-debug \\\ + --disable-qpl \\\ --disable-rbd \\\ --disable-rdma \\\ --disable-relocatable \\\ @@ -1671,6 +1666,7 @@ mkdir -p %{static_builddir} --disable-tools \\\ --disable-tpm \\\ --disable-tsan \\\ + --disable-uadk \\\ --disable-u2f \\\ --disable-usb-redir \\\ --disable-user \\\ @@ -1753,7 +1749,6 @@ run_configure \ --enable-attr \ %ifarch %{ix86} x86_64 --enable-avx2 \ - --enable-avx512f \ --enable-avx512bw \ %endif %if %{have_libblkio} @@ -1867,12 +1862,8 @@ run_configure \ --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 \ @@ -1999,6 +1990,12 @@ install -D -m 0644 %{_sourcedir}/bridge.conf %{buildroot}%{_sysconfdir}/%{name}/ 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 @@ -2248,11 +2245,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %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 @@ -2309,6 +2301,19 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2339,8 +2344,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2361,6 +2369,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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* @@ -2479,8 +2488,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2545,7 +2556,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_bindir}/qemu-mips64el %{_bindir}/qemu-mipsn32 %{_bindir}/qemu-mipsn32el -%{_bindir}/qemu-nios2 %{_bindir}/qemu-or1k %{_bindir}/qemu-ppc %{_bindir}/qemu-ppc64 @@ -2618,9 +2628,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2788,12 +2795,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -2957,6 +2958,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3016,15 +3018,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3155,6 +3148,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_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 @@ -3174,6 +3172,45 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Sep 11 2024 Roberto Campesato - 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 - 9.1.0-1 +- New release qemu 9.1.0 GA + +* Thu Aug 29 2024 Cole Robinson - 9.1.0-0.3.rc4 +- New release qemu-9.1.0-rc4 + +* Mon Aug 26 2024 Cole Robinson - 9.1.0-0.2.rc3 +- New release qemu-9.1.0-rc3 + +* Tue Aug 20 2024 Cole Robinson - 9.1.0-0.1.rc2 +- New release qemu-9.1.0-rc2 + +* Mon Aug 05 2024 Cole Robinson - 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 - 2:9.0.0-4 +- Rebuild for Xen 4.19.0 + +* Mon Jul 22 2024 Lumír Balhar - 2:9.0.0-3 +- Add new systemtap-sdt-dtrace to build deps + +* Fri Jul 19 2024 Fedora Release Engineering - 2:9.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Apr 24 2024 Cole Robinson - 9.0.0-1 +- New release qemu 9.0.0 GA + +* Tue Apr 23 2024 Cole Robinson - 9.0.0-0.1.rc4 +- New release qemu 9.0.0-rc4 + +* Sat Apr 06 2024 Cole Robinson - 8.2.2-2 +- Rebuild for new libiscsi + * Tue Mar 26 2024 Roberto Campesato - 8.2.2-1.1 - include unit test change in patch relaxing CA cert bundle validation diff --git a/sources b/sources index 6517d45..862f989 100644 --- a/sources +++ b/sources @@ -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