From 3c6a0ca33701177e6d470dc4ca4ef8b5cb0f0ce9 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mar 22 2018 13:13:01 +0000 Subject: Rebase to qemu-2.12.0-rc0 - Add hppa and riscv32/64 targets - Add audio and ui modules --- diff --git a/.gitignore b/.gitignore index faaded8..e8240b7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /qemu-2.11.0-rc3.tar.xz /qemu-2.11.0.tar.xz /qemu-2.11.1.tar.xz +/qemu-2.12.0-rc0.tar.xz diff --git a/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch b/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch deleted file mode 100644 index 837be82..0000000 --- a/0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 20 Dec 2017 15:43:07 -0800 -Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap - -This causes LP#1738283. Gerd will have to come up with a better -fix, but just hacking out the problematic key definition should -work for now. ---- - pc-bios/keymaps/en-us | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us -index a70e03adc0..e518a9dc35 100644 ---- a/pc-bios/keymaps/en-us -+++ b/pc-bios/keymaps/en-us -@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock - - # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol) - --# evdev 86 (0x56), QKeyCode "less", number 0x56 --less 0x56 --greater 0x56 shift --bar 0x56 altgr --brokenbar 0x56 shift altgr -- - # evdev 87 (0x57), QKeyCode "f11", number 0x57 - F11 0x57 - --- -2.15.1 - diff --git a/0001-memfd-fix-configure-test.patch b/0001-memfd-fix-configure-test.patch deleted file mode 100644 index b7ef1be..0000000 --- a/0001-memfd-fix-configure-test.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 758ec569df2da73a96bc1902b3524167d002c4c8 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 6339befd8d..692ca970fd 100755 ---- a/configure -+++ b/configure -@@ -3929,7 +3929,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba8..412e94a405 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -2.14.3 - diff --git a/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch b/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch deleted file mode 100644 index 2fb9de0..0000000 --- a/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f7a5376d4b667cf6c83c1d640e32d22456d7b5ee Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Tue, 16 Jan 2018 13:42:10 +0000 -Subject: [PATCH] qapi: ensure stable sort ordering when checking QAPI entities -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some early python 3.x versions will have different default -ordering when calling the 'values()' method on a dict, compared -to python 2.x and later 3.x versions. Explicitly sort the items -to get a stable ordering. - -Reviewed-by: Philippe Mathieu-Daudé -Signed-off-by: Daniel P. Berrange -Message-Id: <20180116134217.8725-8-berrange@redhat.com> -Signed-off-by: Eduardo Habkost ---- - scripts/qapi.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/qapi.py b/scripts/qapi.py -index 1fdd189c0d..58f995b07f 100644 ---- a/scripts/qapi.py -+++ b/scripts/qapi.py -@@ -1678,7 +1678,7 @@ class QAPISchema(object): - assert False - - def check(self): -- for ent in self._entity_dict.values(): -+ for (name, ent) in sorted(self._entity_dict.items()): - ent.check(self) - - def visit(self, visitor): --- -2.14.3 - diff --git a/0002-riscv-force-float-save.patch b/0002-riscv-force-float-save.patch new file mode 100644 index 0000000..a3e69f6 --- /dev/null +++ b/0002-riscv-force-float-save.patch @@ -0,0 +1,11 @@ +diff -ur riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41.old/target/riscv/op_helper.c riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41/target/riscv/op_helper.c +--- riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41.old/target/riscv/op_helper.c 2018-03-02 13:29:21.000000000 +0000 ++++ riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41/target/riscv/op_helper.c 2018-03-10 21:21:48.999120773 +0000 +@@ -144,6 +144,7 @@ + } + + mstatus = (mstatus & ~mask) | (val_to_write & mask); ++ if (mstatus & MSTATUS_FS) mstatus |= MSTATUS_FS; /* FP is always dirty if enabled */ + int dirty = (mstatus & MSTATUS_FS) == MSTATUS_FS; + dirty |= (mstatus & MSTATUS_XS) == MSTATUS_XS; + mstatus = set_field(mstatus, MSTATUS_SD, dirty); diff --git a/qemu.spec b/qemu.spec index 651dcaf..441ba32 100644 --- a/qemu.spec +++ b/qemu.spec @@ -36,15 +36,10 @@ %global have_kvm 1 %endif -%ifarch %{ix86} x86_64 %{arm} aarch64 %{power64} s390 s390x %{mips} -%global have_seccomp 1 -%endif %ifarch %{ix86} x86_64 %global have_spice 1 %endif -%global have_rbd 1 - # Xen is available only on i386 x86_64 (from libvirt spec) %ifarch %{ix86} x86_64 %global have_xen 1 @@ -69,28 +64,25 @@ %global hostqemu x86_64-softmmu/qemu-system-x86_64 %endif -# All block-* modules should be listed here. -%if %{have_rbd} -%global requires_all_block_modules \ +# All modules should be listed here. +%global requires_all_modules \ Requires: %{name}-block-curl = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-dmg = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-nfs = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} -%else -%global requires_all_block_modules \ -Requires: %{name}-block-curl = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-dmg = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-nfs = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} -%endif +Requires: %{name}-audio-alsa = %{epoch}:%{version}-%{release} \ +Requires: %{name}-audio-oss = %{epoch}:%{version}-%{release} \ +Requires: %{name}-audio-pa = %{epoch}:%{version}-%{release} \ +Requires: %{name}-audio-sdl = %{epoch}:%{version}-%{release} \ +Requires: %{name}-ui-curses = %{epoch}:%{version}-%{release} \ +Requires: %{name}-ui-gtk = %{epoch}:%{version}-%{release} \ +Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release} + # Release candidate version tracking -# global rcver rc3 +%global rcver rc0 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -99,8 +91,8 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 2.11.1 -Release: 2%{?rcrel}%{?dist} +Version: 2.12.0 +Release: 0.1%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -135,17 +127,11 @@ Source21: 50-kvm-s390x.conf # /etc/security/limits.d/95-kvm-ppc64-memlock.conf Source22: 95-kvm-ppc64-memlock.conf -# fix compilation on newer glibc -Patch0001: 0001-memfd-fix-configure-test.patch - -# hacky fix for https://bugs.launchpad.net/qemu/+bug/1738283 -Patch0002: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch - -# Non-deterministic python hash iterator sort ordering -Patch0003: 0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch - # Avoid breakage in tests due to stricter crypto policies -Patch0004: 0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch +Patch0001: 0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch +# RISC-V fix from rich: +# https://bugzilla.redhat.com/show_bug.cgi?id=1551452#c7 +Patch0002: 0002-riscv-force-float-save.patch # documentation deps BuildRequires: texinfo @@ -206,17 +192,13 @@ BuildRequires: usbredir-devel >= 0.5.2 BuildRequires: spice-protocol >= 0.12.2 BuildRequires: spice-server-devel >= 0.12.0 %endif -%if 0%{?have_seccomp:1} # seccomp containment support BuildRequires: libseccomp-devel >= 2.3.0 -%endif # For network block driver BuildRequires: libcurl-devel -%if %{have_rbd} # For rbd block driver BuildRequires: librados2-devel BuildRequires: librbd1-devel -%endif # We need both because the 'stap' binary is probed for by configure BuildRequires: systemtap BuildRequires: systemtap-sdt-devel @@ -224,8 +206,6 @@ BuildRequires: systemtap-sdt-devel BuildRequires: libjpeg-devel # For VNC PNG support BuildRequires: libpng-devel -# For uuid generation -BuildRequires: libuuid-devel # For BlueZ device support BuildRequires: bluez-libs-devel # For Braille device support @@ -272,6 +252,10 @@ BuildRequires: virglrenderer-devel BuildRequires: mesa-libgbm-devel # qemu 2.11: preferred disassembler for TCG BuildRequires: capstone-devel +# qemu 2.12: parallels disk images require libxml2 now +BuildRequires: libxml2-devel +# python scripts in the build process +BuildRequires: python3 BuildRequires: glibc-static pcre-static glib2-static zlib-static @@ -285,6 +269,7 @@ BuildRequires: grubby %endif Requires: %{name}-user = %{epoch}:%{version}-%{release} +Requires: %{name}-system-aarch64 = %{epoch}:%{version}-%{release} Requires: %{name}-system-alpha = %{epoch}:%{version}-%{release} Requires: %{name}-system-arm = %{epoch}:%{version}-%{release} Requires: %{name}-system-cris = %{epoch}:%{version}-%{release} @@ -292,18 +277,18 @@ Requires: %{name}-system-lm32 = %{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-moxie = %{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} Requires: %{name}-system-s390x = %{epoch}:%{version}-%{release} Requires: %{name}-system-sh4 = %{epoch}:%{version}-%{release} Requires: %{name}-system-sparc = %{epoch}:%{version}-%{release} +Requires: %{name}-system-tricore = %{epoch}:%{version}-%{release} Requires: %{name}-system-unicore32 = %{epoch}:%{version}-%{release} Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} Requires: %{name}-system-xtensa = %{epoch}:%{version}-%{release} -Requires: %{name}-system-moxie = %{epoch}:%{version}-%{release} -Requires: %{name}-system-aarch64 = %{epoch}:%{version}-%{release} -Requires: %{name}-system-tricore = %{epoch}:%{version}-%{release} -Requires: %{name}-system-nios2 = %{epoch}:%{version}-%{release} Requires: %{name}-img = %{epoch}:%{version}-%{release} @@ -422,7 +407,7 @@ This package provides the additional NFS block driver for QEMU. Install this package if you want to access remote NFS storage. -%if %{have_rbd} + %package block-rbd Summary: QEMU Ceph/RBD block driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -432,7 +417,6 @@ This package provides the additional Ceph/RBD block driver for QEMU. Install this package if you want to access remote Ceph volumes using the rbd protocol. -%endif %package block-ssh @@ -446,6 +430,50 @@ Install this package if you want to access remote disks using the Secure Shell (SSH) protocol. +%package audio-alsa +Summary: QEMU ALSA audio driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description audio-alsa +This package provides the additional ALSA audio driver for QEMU. + +%package audio-oss +Summary: QEMU OSS audio driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description audio-oss +This package provides the additional OSS audio driver for QEMU. + +%package audio-pa +Summary: QEMU PulseAudio audio driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description audio-pa +This package provides the additional PulseAudi audio driver for QEMU. + +%package audio-sdl +Summary: QEMU SDL audio driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description audio-sdl +This package provides the additional SDL audio driver for QEMU. + + +%package ui-curses +Summary: QEMU curses UI driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description ui-curses +This package provides the additional curses UI for QEMU. + +%package ui-gtk +Summary: QEMU GTK UI driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description ui-gtk +This package provides the additional GTK UI for QEMU. + +%package ui-sdl +Summary: QEMU SDL UI driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description ui-sdl +This package provides the additional SDL UI for QEMU. + + %package -n ivshmem-tools Summary: Client and server for QEMU ivshmem device @@ -526,7 +554,7 @@ static binaries %package system-x86 Summary: QEMU system emulator for x86 Requires: %{name}-system-x86-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-x86 QEMU is a generic and open source processor emulator which achieves a good @@ -546,9 +574,6 @@ Requires: seavgabios-bin %if 0%{?have_edk2:1} Requires: edk2-ovmf %endif -%if 0%{?have_seccomp:1} -Requires: libseccomp >= 1.0.0 -%endif %description system-x86-core @@ -563,7 +588,7 @@ platform. %package system-alpha Summary: QEMU system emulator for Alpha Requires: %{name}-system-alpha-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-alpha QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -583,7 +608,7 @@ This package provides the system emulator for Alpha systems. %package system-arm Summary: QEMU system emulator for ARM Requires: %{name}-system-arm-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-arm QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -603,7 +628,7 @@ This package provides the system emulator for ARM boards. %package system-mips Summary: QEMU system emulator for MIPS Requires: %{name}-system-mips-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-mips QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -623,7 +648,7 @@ This package provides the system emulator for MIPS boards. %package system-cris Summary: QEMU system emulator for CRIS Requires: %{name}-system-cris-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-cris QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -643,7 +668,7 @@ This package provides the system emulator for CRIS boards. %package system-lm32 Summary: QEMU system emulator for LatticeMico32 Requires: %{name}-system-lm32-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-lm32 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -663,7 +688,7 @@ This package provides the system emulator for LatticeMico32 boards. %package system-m68k Summary: QEMU system emulator for ColdFire (m68k) Requires: %{name}-system-m68k-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-m68k QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -683,7 +708,7 @@ This package provides the system emulator for ColdFire boards. %package system-microblaze Summary: QEMU system emulator for Microblaze Requires: %{name}-system-microblaze-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-microblaze QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -704,7 +729,7 @@ This package provides the system emulator for Microblaze boards. Summary: QEMU system emulator for OpenRisc32 Requires: %{name}-system-or1k-core = %{epoch}:%{version}-%{release} Obsoletes: %{name}-system-or32 < 2:2.9.0 -%{requires_all_block_modules} +%{requires_all_modules} %description system-or1k QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -722,10 +747,30 @@ emulation speed by using dynamic translation. This package provides the system emulator for OpenRisc32 boards. +%package system-riscv +Summary: QEMU system emulator for RISC-V +Requires: %{name}-system-riscv-core = %{epoch}:%{version}-%{release} +%{requires_all_modules} +%description system-riscv +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for RISC-V systems. + +%package system-riscv-core +Summary: QEMU system emulator for RISC-V +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-riscv-core +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for RISC-V systems. + + %package system-s390x Summary: QEMU system emulator for S390 Requires: %{name}-system-s390x-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-s390x QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -745,7 +790,7 @@ This package provides the system emulator for S390 systems. %package system-sh4 Summary: QEMU system emulator for SH4 Requires: %{name}-system-sh4-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-sh4 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -765,7 +810,7 @@ This package provides the system emulator for SH4 boards. %package system-sparc Summary: QEMU system emulator for SPARC Requires: %{name}-system-sparc-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-sparc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -786,7 +831,7 @@ This package provides the system emulator for SPARC and SPARC64 systems. %package system-ppc Summary: QEMU system emulator for PPC Requires: %{name}-system-ppc-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-ppc QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -809,7 +854,7 @@ This package provides the system emulator for PPC and PPC64 systems. %package system-xtensa Summary: QEMU system emulator for Xtensa Requires: %{name}-system-xtensa-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-xtensa QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -829,7 +874,7 @@ This package provides the system emulator for Xtensa boards. %package system-unicore32 Summary: QEMU system emulator for Unicore32 Requires: %{name}-system-unicore32-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-unicore32 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -849,7 +894,7 @@ This package provides the system emulator for Unicore32 boards. %package system-moxie Summary: QEMU system emulator for Moxie Requires: %{name}-system-moxie-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-moxie QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -869,7 +914,7 @@ This package provides the system emulator for Moxie boards. %package system-aarch64 Summary: QEMU system emulator for AArch64 Requires: %{name}-system-aarch64-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-aarch64 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -892,7 +937,7 @@ This package provides the system emulator for AArch64. %package system-tricore Summary: QEMU system emulator for tricore Requires: %{name}-system-tricore-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-tricore QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -912,7 +957,7 @@ This package provides the system emulator for Tricore. %package system-nios2 Summary: QEMU system emulator for nios2 Requires: %{name}-system-nios2-core = %{epoch}:%{version}-%{release} -%{requires_all_block_modules} +%{requires_all_modules} %description system-nios2 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. @@ -929,6 +974,28 @@ emulation speed by using dynamic translation. This package provides the system emulator for NIOS2. +%package system-hppa +Summary: QEMU system emulator for HPPA +Requires: %{name}-system-hppa-core = %{epoch}:%{version}-%{release} +%{requires_all_modules} +%description system-hppa +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for HPPA. + +%package system-hppa-core +Summary: QEMU system emulator for hppa +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description system-hppa-core +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. + +This package provides the system emulator for HPPA. + + + + %prep %setup -q -n qemu-%{version}%{?rcstr} @@ -962,6 +1029,7 @@ system_arch="\ alpha \ arm \ cris \ + hppa \ i386 \ lm32 \ m68k \ @@ -977,6 +1045,8 @@ system_arch="\ ppc \ ppc64 \ ppcemb \ + riscv32 \ + riscv64 \ s390x \ sh4 \ sh4eb \ @@ -990,6 +1060,7 @@ system_arch="\ user_arch="\ aarch64 \ + aarch64_be \ alpha \ arm \ armeb \ @@ -1017,6 +1088,8 @@ user_arch="\ sparc \ sparc32plus \ sparc64 \ + riscv32 \ + riscv64 \ x86_64" dynamic_targets= @@ -1052,7 +1125,7 @@ run_configure() { --disable-strip \ --disable-werror \ --enable-kvm \ - --python=/usr/bin/python2 \ + --python=/usr/bin/python3 \ %ifarch s390 %{mips64} --enable-tcg-interpreter \ %endif @@ -1517,33 +1590,38 @@ getent passwd qemu >/dev/null || \ %files block-curl %{_libdir}/qemu/block-curl.so - - %files block-dmg %{_libdir}/qemu/block-dmg-bz2.so - - %files block-gluster %{_libdir}/qemu/block-gluster.so - - %files block-iscsi %{_libdir}/qemu/block-iscsi.so - - %files block-nfs %{_libdir}/qemu/block-nfs.so - -%if %{have_rbd} %files block-rbd %{_libdir}/qemu/block-rbd.so -%endif - - %files block-ssh %{_libdir}/qemu/block-ssh.so +%files audio-alsa +%{_libdir}/qemu/audio-alsa.so +%files audio-oss +%{_libdir}/qemu/audio-oss.so +%files audio-pa +%{_libdir}/qemu/audio-pa.so +%files audio-sdl +%{_libdir}/qemu/audio-sdl.so + + +%files ui-curses +%{_libdir}/qemu/ui-curses.so +%files ui-gtk +%{_libdir}/qemu/ui-gtk.so +%files ui-sdl +%{_libdir}/qemu/ui-sdl.so + + %files -n ivshmem-tools %{_bindir}/ivshmem-client %{_bindir}/ivshmem-server @@ -1562,6 +1640,7 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-i386 %{_bindir}/qemu-x86_64 %{_bindir}/qemu-aarch64 +%{_bindir}/qemu-aarch64_be %{_bindir}/qemu-alpha %{_bindir}/qemu-arm %{_bindir}/qemu-armeb @@ -1582,6 +1661,8 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-ppc64 %{_bindir}/qemu-ppc64abi32 %{_bindir}/qemu-ppc64le +%{_bindir}/qemu-riscv32 +%{_bindir}/qemu-riscv64 %{_bindir}/qemu-s390x %{_bindir}/qemu-sh4 %{_bindir}/qemu-sh4eb @@ -1595,6 +1676,8 @@ getent passwd qemu >/dev/null || \ %{_datadir}/systemtap/tapset/qemu-x86_64-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-aarch64.stp %{_datadir}/systemtap/tapset/qemu-aarch64-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-alpha.stp %{_datadir}/systemtap/tapset/qemu-alpha-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-arm.stp @@ -1635,6 +1718,10 @@ getent passwd qemu >/dev/null || \ %{_datadir}/systemtap/tapset/qemu-ppc64abi32-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-ppc64le.stp %{_datadir}/systemtap/tapset/qemu-ppc64le-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-riscv32.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-simpletrace.stp +%{_datadir}/systemtap/tapset/qemu-riscv64.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-s390x.stp %{_datadir}/systemtap/tapset/qemu-s390x-simpletrace.stp %{_datadir}/systemtap/tapset/qemu-sh4.stp @@ -1657,6 +1744,7 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-i386-static %{_bindir}/qemu-x86_64-static %{_bindir}/qemu-aarch64-static +%{_bindir}/qemu-aarch64_be-static %{_bindir}/qemu-alpha-static %{_bindir}/qemu-arm-static %{_bindir}/qemu-armeb-static @@ -1677,6 +1765,8 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-ppc64-static %{_bindir}/qemu-ppc64abi32-static %{_bindir}/qemu-ppc64le-static +%{_bindir}/qemu-riscv32-static +%{_bindir}/qemu-riscv64-static %{_bindir}/qemu-s390x-static %{_bindir}/qemu-sh4-static %{_bindir}/qemu-sh4eb-static @@ -1690,6 +1780,8 @@ getent passwd qemu >/dev/null || \ %{_datadir}/systemtap/tapset/qemu-x86_64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-aarch64-static.stp %{_datadir}/systemtap/tapset/qemu-aarch64-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-static.stp +%{_datadir}/systemtap/tapset/qemu-aarch64_be-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-alpha-static.stp %{_datadir}/systemtap/tapset/qemu-alpha-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-arm-static.stp @@ -1730,6 +1822,10 @@ getent passwd qemu >/dev/null || \ %{_datadir}/systemtap/tapset/qemu-ppc64abi32-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-ppc64le-static.stp %{_datadir}/systemtap/tapset/qemu-ppc64le-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv32-simpletrace-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-static.stp +%{_datadir}/systemtap/tapset/qemu-riscv64-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-s390x-static.stp %{_datadir}/systemtap/tapset/qemu-s390x-simpletrace-static.stp %{_datadir}/systemtap/tapset/qemu-sh4-static.stp @@ -1761,7 +1857,6 @@ getent passwd qemu >/dev/null || \ %{_mandir}/man1/qemu-kvm.1* %endif -%{_datadir}/%{name}/acpi-dsdt.aml %{_datadir}/%{name}/bios.bin %{_datadir}/%{name}/bios-256k.bin %{_datadir}/%{name}/sgabios.bin @@ -1853,6 +1948,16 @@ getent passwd qemu >/dev/null || \ %{_mandir}/man1/qemu-system-or1k.1* +%files system-riscv +# Deliberately empty + +%files system-riscv-core +%{_bindir}/qemu-system-riscv32 +%{_bindir}/qemu-system-riscv64 +%{_datadir}/systemtap/tapset/qemu-system-riscv*.stp +%{_mandir}/man1/qemu-system-riscv*.1* + + %files system-s390x # Deliberately empty @@ -1903,11 +2008,13 @@ getent passwd qemu >/dev/null || \ %{_mandir}/man1/qemu-system-ppc64.1* %{_mandir}/man1/qemu-system-ppcemb.1* %{_datadir}/%{name}/bamboo.dtb +%{_datadir}/%{name}/canyonlands.dtb %{_datadir}/%{name}/ppc_rom.bin %{_datadir}/%{name}/qemu_vga.ndrv %{_datadir}/%{name}/skiboot.lid %{_datadir}/%{name}/spapr-rtas.bin %{_datadir}/%{name}/u-boot.e500 +%{_datadir}/%{name}/u-boot-sam460-20100605.bin %ifarch %{power64} %{_sysconfdir}/security/limits.d/95-kvm-ppc64-memlock.conf %endif @@ -1949,6 +2056,7 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-system-aarch64 %{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp %{_mandir}/man1/qemu-system-aarch64.1* +%{_datadir}/%{name}/hppa-firmware.img %files system-tricore @@ -1969,7 +2077,21 @@ getent passwd qemu >/dev/null || \ %{_mandir}/man1/qemu-system-nios2.1* +%files system-hppa +# Deliberately empty + +%files system-hppa-core +%{_bindir}/qemu-system-hppa +%{_datadir}/systemtap/tapset/qemu-system-hppa*.stp +%{_mandir}/man1/qemu-system-hppa.1* + + %changelog +* Thu Mar 22 2018 Cole Robinson - 2:2.12.0-0.1.rc0 +- Rebase to qemu-2.12.0-rc0 +- Add hppa and riscv32/64 targets +- Add audio and ui modules + * Mon Mar 19 2018 Daniel P. Berrangé - 2:2.11.1-2 - Re-enable normal hardened build macros to fix ksmctl.c hardening - Don't strip _FORTIFY_SOURCE from compiler flags diff --git a/sources b/sources index 07f92da..c89120e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-2.11.1.tar.xz) = 7fd4a7c6fa8627510431ed34f05bdd6b055ea66207bab29904bbce66dfd5b07546f02dfcb34937f48efb67184200ab3c8501763776adc1cdc1302a924fb2a5ef +SHA512 (qemu-2.12.0-rc0.tar.xz) = cf12df94552ca90a9ce736152c1c2c2cf4788c4b2110216464f8b0efa40ccfefb017345a03f5e796da45b559baa74a1e317751ebbc2d3b2650e250361112509e