From 2d7bf67d6aaac935a1f48f3c59080fb99ff3e5c918a73db0a3f1a826c73ace8c Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 5 Mar 2021 22:16:47 +0000 Subject: [PATCH] Accepting request 877306 from home:bfrogers:branches:Virtualization - Fix GCC11 compiler issue in brotli (edk2) code (boo#1181922) brotli-fix-actual-variable-array-paramet.patch - Tweak a few submodule descriptions and summaries - Fix a backward compatibility issue in ACPI data i386-acpi-restore-device-paths-for-pre-5.patch OBS-URL: https://build.opensuse.org/request/show/877306 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=625 --- _constraints | 2 +- ...li-fix-actual-variable-array-paramet.patch | 49 ++++++ bundles.tar.xz | 4 +- ...-acpi-restore-device-paths-for-pre-5.patch | 110 +++++++++++++ qemu.changes | 9 ++ qemu.spec | 151 ++++++++++-------- qemu.spec.in | 42 ++--- 7 files changed, 274 insertions(+), 93 deletions(-) create mode 100644 brotli-fix-actual-variable-array-paramet.patch create mode 100644 i386-acpi-restore-device-paths-for-pre-5.patch diff --git a/_constraints b/_constraints index 5cee89c..ba5965e 100644 --- a/_constraints +++ b/_constraints @@ -1,5 +1,5 @@ - + qemu diff --git a/brotli-fix-actual-variable-array-paramet.patch b/brotli-fix-actual-variable-array-paramet.patch new file mode 100644 index 0000000..83d2695 --- /dev/null +++ b/brotli-fix-actual-variable-array-paramet.patch @@ -0,0 +1,49 @@ +From: Bruce Rogers +Date: Fri, 5 Mar 2021 13:25:44 -0700 +Subject: brotli: fix actual variable-array parameters to match declaration + +References: boo#1181922 + +GCC 11 complains about the mismatch between the variable-array +parameters not being defined as such in the actual function definition. +Make them match. + +Signed-off-by: Bruce Rogers +--- + c/dec/decode.c | 6 ++++-- + c/enc/encode.c | 5 +++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c +index 114c5057d7d91f5a634167e00d84..bb6f1ab6cc42f54720fd07f665e3 100644 +--- a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c ++++ b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c +@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands( + } + + BrotliDecoderResult BrotliDecoderDecompress( +- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, +- uint8_t* decoded_buffer) { ++ size_t encoded_size, ++ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], ++ size_t* decoded_size, ++ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { + BrotliDecoderState s; + BrotliDecoderResult result; + size_t total_out = 0; +diff --git a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c +index 68548ef55af8036d6f0fe720e721..ab0a4906060c98461102d45ab61d 100644 +--- a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c ++++ b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c +@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( + + BROTLI_BOOL BrotliEncoderCompress( + int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, +- const uint8_t* input_buffer, size_t* encoded_size, +- uint8_t* encoded_buffer) { ++ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], ++ size_t* encoded_size, ++ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { + BrotliEncoderState* s; + size_t out_size = *encoded_size; + const uint8_t* input_start = input_buffer; diff --git a/bundles.tar.xz b/bundles.tar.xz index 8a6f244..421b72e 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cff512b6960855e812b61d46bb5d804dc2aeb49bb19a4938573f16fa6f822e3d -size 62928 +oid sha256:db7eea1b8c892e467a2d350b86135933149a880d21d28228a2a226afaa676923 +size 64840 diff --git a/i386-acpi-restore-device-paths-for-pre-5.patch b/i386-acpi-restore-device-paths-for-pre-5.patch new file mode 100644 index 0000000..2c4e168 --- /dev/null +++ b/i386-acpi-restore-device-paths-for-pre-5.patch @@ -0,0 +1,110 @@ +From: Vitaly Cheptsov +Date: Mon, 1 Mar 2021 22:59:18 +0300 +Subject: i386/acpi: restore device paths for pre-5.1 vms + +Git-commit: 0a343a5add75f9f90c65e932863d57ddbcb28f5c + +After fixing the _UID value for the primary PCI root bridge in +af1b80ae it was discovered that this change updates Windows +configuration in an incompatible way causing network configuration +failure unless DHCP is used. More details provided on the list: + +https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html + +This change reverts the _UID update from 1 to 0 for q35 and i440fx +VMs before version 5.2 to maintain the original behaviour when +upgrading. + +Cc: qemu-stable@nongnu.org +Cc: qemu-devel@nongnu.org +Reported-by: Thomas Lamprecht +Suggested-by: Michael S. Tsirkin +Signed-off-by: Vitaly Cheptsov +Message-Id: <20210301195919.9333-1-cheptsov@ispras.ru> +Tested-by: Thomas Lamprecht +Reviewed-by: Igor Mammedov +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +Fixes: af1b80ae56c9 ("i386/acpi: fix inconsistent QEMU/OVMF device paths") +Signed-off-by: Bruce Rogers +--- + hw/i386/acpi-build.c | 4 ++-- + hw/i386/pc_piix.c | 2 ++ + hw/i386/pc_q35.c | 2 ++ + include/hw/i386/pc.h | 1 + + 4 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c +index 1f5c2112452a74bc19cb3a129fa9..b5616582a5d8395ab38080567356 100644 +--- a/hw/i386/acpi-build.c ++++ b/hw/i386/acpi-build.c +@@ -1513,7 +1513,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, + dev = aml_device("PCI0"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03"))); + aml_append(dev, aml_name_decl("_ADR", aml_int(0))); +- aml_append(dev, aml_name_decl("_UID", aml_int(0))); ++ aml_append(dev, aml_name_decl("_UID", aml_int(pcmc->pci_root_uid))); + aml_append(sb_scope, dev); + aml_append(dsdt, sb_scope); + +@@ -1530,7 +1530,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"))); + aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); + aml_append(dev, aml_name_decl("_ADR", aml_int(0))); +- aml_append(dev, aml_name_decl("_UID", aml_int(0))); ++ aml_append(dev, aml_name_decl("_UID", aml_int(pcmc->pci_root_uid))); + aml_append(dev, build_q35_osc_method()); + aml_append(sb_scope, dev); + +diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c +index 13d1628f13bfc537cbefaec47e27..2524c962161115d026cc810b8dc8 100644 +--- a/hw/i386/pc_piix.c ++++ b/hw/i386/pc_piix.c +@@ -417,6 +417,7 @@ static void pc_i440fx_machine_options(MachineClass *m) + { + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pcmc->default_nic_model = "e1000"; ++ pcmc->pci_root_uid = 0; + + m->family = "pc_piix"; + m->desc = "Standard PC (i440FX + PIIX, 1996)"; +@@ -448,6 +449,7 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); + pcmc->kvmclock_create_always = false; ++ pcmc->pci_root_uid = 1; + } + + DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, +diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c +index a3f4959c43575ad9809a0ac8b7a5..c58dad5ae37f7190f308c512c339 100644 +--- a/hw/i386/pc_q35.c ++++ b/hw/i386/pc_q35.c +@@ -329,6 +329,7 @@ static void pc_q35_machine_options(MachineClass *m) + { + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); + pcmc->default_nic_model = "e1000e"; ++ pcmc->pci_root_uid = 0; + + m->family = "pc_q35"; + m->desc = "Standard PC (Q35 + ICH9, 2009)"; +@@ -364,6 +365,7 @@ static void pc_q35_5_1_machine_options(MachineClass *m) + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); + pcmc->kvmclock_create_always = false; ++ pcmc->pci_root_uid = 1; + } + + DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, +diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h +index 911e4600970c36de9371a46601c6..7f8e1a791f88ead6cd5cb2a91e8b 100644 +--- a/include/hw/i386/pc.h ++++ b/include/hw/i386/pc.h +@@ -99,6 +99,7 @@ struct PCMachineClass { + int legacy_acpi_table_size; + unsigned acpi_data_size; + bool do_not_add_smb_acpi; ++ int pci_root_uid; + + /* SMBIOS compat: */ + bool smbios_defaults; diff --git a/qemu.changes b/qemu.changes index 3db57f4..cc8c1a4 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 5 21:35:22 UTC 2021 - Bruce Rogers + +- Fix GCC11 compiler issue in brotli (edk2) code (boo#1181922) + brotli-fix-actual-variable-array-paramet.patch +- Tweak a few submodule descriptions and summaries +- Fix a backward compatibility issue in ACPI data + i386-acpi-restore-device-paths-for-pre-5.patch + ------------------------------------------------------------------- Wed Mar 3 17:18:39 UTC 2021 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index e06320b..d0f4a26 100644 --- a/qemu.spec +++ b/qemu.spec @@ -156,53 +156,54 @@ Patch00022: qemu-storage-daemon-Enable-object-add.patch Patch00023: blockjob-Fix-crash-with-IOthread-when-bl.patch Patch00024: monitor-Fix-assertion-failure-on-shutdow.patch Patch00025: spice-app-avoid-crash-when-core-spice-mo.patch -Patch00026: hw-s390x-fix-build-for-virtio-9p-ccw.patch -Patch00027: hw-s390x-modularize-virtio-gpu-ccw.patch -Patch00028: XXX-dont-dump-core-on-sigabort.patch -Patch00029: qemu-binfmt-conf-Modify-default-path.patch -Patch00030: qemu-cvs-gettimeofday.patch -Patch00031: qemu-cvs-ioctl_debug.patch -Patch00032: qemu-cvs-ioctl_nodirection.patch -Patch00033: linux-user-add-binfmt-wrapper-for-argv-0.patch -Patch00034: PPC-KVM-Disable-mmu-notifier-check.patch -Patch00035: linux-user-binfmt-support-host-binaries.patch -Patch00036: linux-user-Fake-proc-cpuinfo.patch -Patch00037: linux-user-use-target_ulong.patch -Patch00038: Make-char-muxer-more-robust-wrt-small-FI.patch -Patch00039: linux-user-lseek-explicitly-cast-non-set.patch -Patch00040: AIO-Reduce-number-of-threads-for-32bit-h.patch -Patch00041: xen_disk-Add-suse-specific-flush-disable.patch -Patch00042: qemu-bridge-helper-reduce-security-profi.patch -Patch00043: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch -Patch00044: roms-Makefile-pass-a-packaging-timestamp.patch -Patch00045: Raise-soft-address-space-limit-to-hard-l.patch -Patch00046: increase-x86_64-physical-bits-to-42.patch -Patch00047: i8254-Fix-migration-from-SLE11-SP2.patch -Patch00048: acpi_piix4-Fix-migration-from-SLE11-SP2.patch -Patch00049: Make-installed-scripts-explicitly-python.patch -Patch00050: hw-smbios-handle-both-file-formats-regar.patch -Patch00051: xen-add-block-resize-support-for-xen-dis.patch -Patch00052: tests-qemu-iotests-Triple-timeout-of-i-o.patch -Patch00053: tests-Fix-block-tests-to-be-compatible-w.patch -Patch00054: xen-ignore-live-parameter-from-xen-save-.patch -Patch00055: tests-change-error-message-in-test-162.patch -Patch00056: hw-intc-exynos4210_gic-provide-more-room.patch -Patch00057: configure-only-populate-roms-if-softmmu.patch -Patch00058: pc-bios-s390-ccw-net-avoid-warning-about.patch -Patch00059: roms-change-cross-compiler-naming-to-be-.patch -Patch00060: test-add-mapping-from-arch-of-i686-to-qe.patch -Patch00061: configure-remove-pkgversion-from-CONFIG_.patch -Patch00062: docs-add-SUSE-support-statements-to-html.patch -Patch00063: s390x-Fix-stringop-truncation-issue-repo.patch -Patch00064: Revert-qht-constify-qht_statistics_init.patch -Patch00065: qht-Revert-some-constification-in-qht.c.patch -Patch00066: meson-install-ivshmem-client-and-ivshmem.patch -Patch00067: Revert-roms-efirom-tests-uefi-test-tools.patch -Patch00068: Makefile-Don-t-check-pc-bios-as-pre-requ.patch -Patch00069: roms-Makefile-add-cross-file-to-qboot-me.patch -Patch00070: usb-Help-compiler-out-to-avoid-a-warning.patch -Patch00071: module-for-virtio-gpu-pre-load-module-to.patch -Patch00072: qom-handle-case-of-chardev-spice-module-.patch +Patch00026: i386-acpi-restore-device-paths-for-pre-5.patch +Patch00027: hw-s390x-fix-build-for-virtio-9p-ccw.patch +Patch00028: hw-s390x-modularize-virtio-gpu-ccw.patch +Patch00029: XXX-dont-dump-core-on-sigabort.patch +Patch00030: qemu-binfmt-conf-Modify-default-path.patch +Patch00031: qemu-cvs-gettimeofday.patch +Patch00032: qemu-cvs-ioctl_debug.patch +Patch00033: qemu-cvs-ioctl_nodirection.patch +Patch00034: linux-user-add-binfmt-wrapper-for-argv-0.patch +Patch00035: PPC-KVM-Disable-mmu-notifier-check.patch +Patch00036: linux-user-binfmt-support-host-binaries.patch +Patch00037: linux-user-Fake-proc-cpuinfo.patch +Patch00038: linux-user-use-target_ulong.patch +Patch00039: Make-char-muxer-more-robust-wrt-small-FI.patch +Patch00040: linux-user-lseek-explicitly-cast-non-set.patch +Patch00041: AIO-Reduce-number-of-threads-for-32bit-h.patch +Patch00042: xen_disk-Add-suse-specific-flush-disable.patch +Patch00043: qemu-bridge-helper-reduce-security-profi.patch +Patch00044: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch +Patch00045: roms-Makefile-pass-a-packaging-timestamp.patch +Patch00046: Raise-soft-address-space-limit-to-hard-l.patch +Patch00047: increase-x86_64-physical-bits-to-42.patch +Patch00048: i8254-Fix-migration-from-SLE11-SP2.patch +Patch00049: acpi_piix4-Fix-migration-from-SLE11-SP2.patch +Patch00050: Make-installed-scripts-explicitly-python.patch +Patch00051: hw-smbios-handle-both-file-formats-regar.patch +Patch00052: xen-add-block-resize-support-for-xen-dis.patch +Patch00053: tests-qemu-iotests-Triple-timeout-of-i-o.patch +Patch00054: tests-Fix-block-tests-to-be-compatible-w.patch +Patch00055: xen-ignore-live-parameter-from-xen-save-.patch +Patch00056: tests-change-error-message-in-test-162.patch +Patch00057: hw-intc-exynos4210_gic-provide-more-room.patch +Patch00058: configure-only-populate-roms-if-softmmu.patch +Patch00059: pc-bios-s390-ccw-net-avoid-warning-about.patch +Patch00060: roms-change-cross-compiler-naming-to-be-.patch +Patch00061: test-add-mapping-from-arch-of-i686-to-qe.patch +Patch00062: configure-remove-pkgversion-from-CONFIG_.patch +Patch00063: docs-add-SUSE-support-statements-to-html.patch +Patch00064: s390x-Fix-stringop-truncation-issue-repo.patch +Patch00065: Revert-qht-constify-qht_statistics_init.patch +Patch00066: qht-Revert-some-constification-in-qht.c.patch +Patch00067: meson-install-ivshmem-client-and-ivshmem.patch +Patch00068: Revert-roms-efirom-tests-uefi-test-tools.patch +Patch00069: Makefile-Don-t-check-pc-bios-as-pre-requ.patch +Patch00070: roms-Makefile-add-cross-file-to-qboot-me.patch +Patch00071: usb-Help-compiler-out-to-avoid-a-warning.patch +Patch00072: module-for-virtio-gpu-pre-load-module-to.patch +Patch00073: qom-handle-case-of-chardev-spice-module-.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -220,6 +221,8 @@ Patch03001: roms-sgabios-Fix-csum8-to-be-built-by-ho.patch Patch08000: Make-keycode-gen-output-reproducible-use.patch # Patches applied in roms/qboot/: Patch11000: qboot-add-cross.ini-file-to-handle-aarch.patch +# Patches applied in roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/: +Patch27000: brotli-fix-actual-variable-array-paramet.patch # Please do not add patches manually here. @@ -636,7 +639,8 @@ Release: 0 %{qemu_module_conflicts} %description block-nfs -This package contains a module for directly accessing nfs based image files. +This package contains a module for directly accessing nfs based image files +for QEMU. %if 0%{?with_rbd} %package block-rbd @@ -647,7 +651,8 @@ Release: 0 %{qemu_module_conflicts} %description block-rbd -This package contains a module for accessing ceph (rbd,rados) image files. +This package contains a module for accessing ceph (rbd,rados) image files +for QEMU. %endif %package block-ssh @@ -670,7 +675,7 @@ Provides: %name:%_datadir/%name/forsplits/00 %{qemu_module_conflicts} %description chardev-baum -This package contains a module for baum braille chardev support. +This package contains a module for baum braille chardev support for QEMU. %package chardev-spice Summary: Spice vmc and port chardev support for QEMU @@ -682,7 +687,7 @@ Requires: qemu-ui-spice-core %{qemu_module_conflicts} %description chardev-spice -This package contains a module for Spice chardev support. +This package contains a module for Spice chardev support for QEMU. %package hw-display-qxl Summary: QXL display support for QEMU @@ -694,7 +699,7 @@ Requires: qemu-ui-spice-core %{qemu_module_conflicts} %description hw-display-qxl -This package contains a module for QXL display support. +This package contains a module for QXL display support for QEMU. %package hw-display-virtio-gpu Summary: Virtio GPU display support for QEMU @@ -705,10 +710,10 @@ Provides: %name:%_datadir/%name/forsplits/04 %{qemu_module_conflicts} %description hw-display-virtio-gpu -This package contains a module for Virtio GPU display support. +This package contains a module for Virtio GPU display support for QEMU. %package hw-display-virtio-gpu-pci -Summary: Virtio-gpu driver for QEMU +Summary: Virtio-gpu pci device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -717,10 +722,10 @@ Provides: %name:%_datadir/%name/forsplits/11 %{qemu_module_conflicts} %description hw-display-virtio-gpu-pci -This package contains a virtio gpu driver for QEMU +This package contains a module providing the virtio gpu pci device for QEMU. %package hw-display-virtio-vga -Summary: Virtio vga driver for QEMU +Summary: Virtio vga device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -728,10 +733,10 @@ Provides: %name:%_datadir/%name/forsplits/12 %{qemu_module_conflicts} %description hw-display-virtio-vga -This package contains a virtio vga driver for QEMU +This package contains a module providing the virtio vga device for QEMU. %package hw-s390x-virtio-gpu-ccw -Summary: S390x virtio-gpu driver for QEMU +Summary: S390x virtio-gpu ccw device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -740,7 +745,8 @@ Provides: %name:%_datadir/%name/forsplits/13 %{qemu_module_conflicts} %description hw-s390x-virtio-gpu-ccw -This package contains an s390x virtio gpu driver for QEMU +This package contains a module providing the s390x virtio gpu ccw device for +QEMU. %package hw-usb-redirect Summary: USB redirection support for QEMU @@ -751,7 +757,7 @@ Provides: %name:%_datadir/%name/forsplits/02 %{qemu_module_conflicts} %description hw-usb-redirect -This package contains a module for USB redirection support. +This package contains a module for USB redirection support for QEMU. %package hw-usb-smartcard Summary: USB smartcard support for QEMU @@ -762,7 +768,7 @@ Provides: %name:%_datadir/%name/forsplits/03 %{qemu_module_conflicts} %description hw-usb-smartcard -This package contains a modules for USB smartcard support. +This package contains a modules for USB smartcard support for QEMU. %package ui-curses Summary: Curses based UI support for QEMU @@ -830,7 +836,8 @@ Release: 0 %{qemu_module_conflicts} %description vhost-user-gpu -This package contains a vhost user mode virtio-gpu 2D/3D rendering backend for QEMU +This package contains a vhost user mode virtio-gpu 2D/3D rendering backend for +QEMU. %package tools Summary: Tools for QEMU @@ -887,8 +894,8 @@ Release: 0 BuildArch: noarch %description microvm -This package provides minimal x86 firmware for booting certain guests. -qboot provides the minimum resources needed to boot PVH and bzImages. +This package provides minimal x86 firmware for booting certain guests under +QEMU. qboot provides the minimum resources needed to boot PVH and bzImages. bios-microvm, created from a minimal seabios configuration, provides slightly wider support than qboot, but still focuses on quick boot up. @@ -915,7 +922,7 @@ Conflicts: %name < 1.6.0 %description vgabios VGABIOS provides the video ROM BIOSes for the following variants of VGA emulated devices: Std VGA, QXL, Cirrus CLGD 5446 and VMware emulated -video card. +video card. For use with QEMU. %package sgabios Summary: Serial Graphics Adapter BIOS for QEMU @@ -928,7 +935,7 @@ Conflicts: %name < 1.6.0 %description sgabios The Google Serial Graphics Adapter BIOS or SGABIOS provides a means for legacy x86 software to communicate with an attached serial console as if a video card -were attached. +were attached. For use with QEMU. %package ipxe Summary: PXE ROMs for QEMU NICs @@ -1087,23 +1094,24 @@ This package records qemu testsuite results and represents successful testing. %patch00059 -p1 %patch00060 -p1 %patch00061 -p1 -%if %{legacy_qemu_kvm} %patch00062 -p1 -%endif +%if %{legacy_qemu_kvm} %patch00063 -p1 +%endif %patch00064 -p1 %patch00065 -p1 %patch00066 -p1 %patch00067 -p1 %patch00068 -p1 -%ifarch aarch64 %patch00069 -p1 -%endif -%ifarch %arm %ix86 ppc +%ifarch aarch64 %patch00070 -p1 %endif +%ifarch %arm %ix86 ppc %patch00071 -p1 +%endif %patch00072 -p1 +%patch00073 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 @@ -1118,6 +1126,7 @@ This package records qemu testsuite results and represents successful testing. %patch03001 -p1 %patch08000 -p1 %patch11000 -p1 +%patch27000 -p1 %if "%{name}" != "qemu-linux-user" # for the record, this set of firmware files is installed, but we don't diff --git a/qemu.spec.in b/qemu.spec.in index 08be05a..9cf9af2 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -543,7 +543,8 @@ Release: 0 %{qemu_module_conflicts} %description block-nfs -This package contains a module for directly accessing nfs based image files. +This package contains a module for directly accessing nfs based image files +for QEMU. %if 0%{?with_rbd} %package block-rbd @@ -554,7 +555,8 @@ Release: 0 %{qemu_module_conflicts} %description block-rbd -This package contains a module for accessing ceph (rbd,rados) image files. +This package contains a module for accessing ceph (rbd,rados) image files +for QEMU. %endif %package block-ssh @@ -577,7 +579,7 @@ Provides: %name:%_datadir/%name/forsplits/00 %{qemu_module_conflicts} %description chardev-baum -This package contains a module for baum braille chardev support. +This package contains a module for baum braille chardev support for QEMU. %package chardev-spice Summary: Spice vmc and port chardev support for QEMU @@ -589,7 +591,7 @@ Requires: qemu-ui-spice-core %{qemu_module_conflicts} %description chardev-spice -This package contains a module for Spice chardev support. +This package contains a module for Spice chardev support for QEMU. %package hw-display-qxl Summary: QXL display support for QEMU @@ -601,7 +603,7 @@ Requires: qemu-ui-spice-core %{qemu_module_conflicts} %description hw-display-qxl -This package contains a module for QXL display support. +This package contains a module for QXL display support for QEMU. %package hw-display-virtio-gpu Summary: Virtio GPU display support for QEMU @@ -612,10 +614,10 @@ Provides: %name:%_datadir/%name/forsplits/04 %{qemu_module_conflicts} %description hw-display-virtio-gpu -This package contains a module for Virtio GPU display support. +This package contains a module for Virtio GPU display support for QEMU. %package hw-display-virtio-gpu-pci -Summary: Virtio-gpu driver for QEMU +Summary: Virtio-gpu pci device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -624,10 +626,10 @@ Provides: %name:%_datadir/%name/forsplits/11 %{qemu_module_conflicts} %description hw-display-virtio-gpu-pci -This package contains a virtio gpu driver for QEMU +This package contains a module providing the virtio gpu pci device for QEMU. %package hw-display-virtio-vga -Summary: Virtio vga driver for QEMU +Summary: Virtio vga device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -635,10 +637,10 @@ Provides: %name:%_datadir/%name/forsplits/12 %{qemu_module_conflicts} %description hw-display-virtio-vga -This package contains a virtio vga driver for QEMU +This package contains a module providing the virtio vga device for QEMU. %package hw-s390x-virtio-gpu-ccw -Summary: S390x virtio-gpu driver for QEMU +Summary: S390x virtio-gpu ccw device for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 @@ -647,7 +649,8 @@ Provides: %name:%_datadir/%name/forsplits/13 %{qemu_module_conflicts} %description hw-s390x-virtio-gpu-ccw -This package contains an s390x virtio gpu driver for QEMU +This package contains a module providing the s390x virtio gpu ccw device for +QEMU. %package hw-usb-redirect Summary: USB redirection support for QEMU @@ -658,7 +661,7 @@ Provides: %name:%_datadir/%name/forsplits/02 %{qemu_module_conflicts} %description hw-usb-redirect -This package contains a module for USB redirection support. +This package contains a module for USB redirection support for QEMU. %package hw-usb-smartcard Summary: USB smartcard support for QEMU @@ -669,7 +672,7 @@ Provides: %name:%_datadir/%name/forsplits/03 %{qemu_module_conflicts} %description hw-usb-smartcard -This package contains a modules for USB smartcard support. +This package contains a modules for USB smartcard support for QEMU. %package ui-curses Summary: Curses based UI support for QEMU @@ -737,7 +740,8 @@ Release: 0 %{qemu_module_conflicts} %description vhost-user-gpu -This package contains a vhost user mode virtio-gpu 2D/3D rendering backend for QEMU +This package contains a vhost user mode virtio-gpu 2D/3D rendering backend for +QEMU. %package tools Summary: Tools for QEMU @@ -794,8 +798,8 @@ Release: 0 BuildArch: noarch %description microvm -This package provides minimal x86 firmware for booting certain guests. -qboot provides the minimum resources needed to boot PVH and bzImages. +This package provides minimal x86 firmware for booting certain guests under +QEMU. qboot provides the minimum resources needed to boot PVH and bzImages. bios-microvm, created from a minimal seabios configuration, provides slightly wider support than qboot, but still focuses on quick boot up. @@ -822,7 +826,7 @@ Conflicts: %name < 1.6.0 %description vgabios VGABIOS provides the video ROM BIOSes for the following variants of VGA emulated devices: Std VGA, QXL, Cirrus CLGD 5446 and VMware emulated -video card. +video card. For use with QEMU. %package sgabios Summary: Serial Graphics Adapter BIOS for QEMU @@ -835,7 +839,7 @@ Conflicts: %name < 1.6.0 %description sgabios The Google Serial Graphics Adapter BIOS or SGABIOS provides a means for legacy x86 software to communicate with an attached serial console as if a video card -were attached. +were attached. For use with QEMU. %package ipxe Summary: PXE ROMs for QEMU NICs