Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-05-17 22:01:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2014-04-22 10:06:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2014-05-17 22:01:30.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 13 08:17:18 UTC 2014 - [email protected] + +- ABI fixes for ppc64le TCG + 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-04-22 10:06:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-05-17 22:01:30.000000000 +0200 @@ -1,0 +2,24 @@ +Wed May 14 13:44:38 UTC 2014 - [email protected] + +- Fix conflict with libcacard 0.1.2 from project security +* Adopt description and group for libcacard-devel from there +- Drop libcacard.{a,la} from libcacard-devel + If needed, libcacard.a should go into a libcacard-devel-static. +- Change qemu-extra to explicitly list qemu-system-* binaries + +------------------------------------------------------------------- +Tue May 13 08:17:18 UTC 2014 - [email protected] + +- ABI fixes for ppc64le TCG. Addresses acpi-test failures. + 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch + +------------------------------------------------------------------- +Sat May 10 20:06:24 UTC 2014 - [email protected] + +- Split 60-kvm.rules into 60-kvm.rules and 60-kvm.x86.rules +- Install udev rules on s390x, ppc and arm, too +* Clean up KVM vs. qemu-kvm conditionals +- Package qemu-system-ppcemb in qemu-ppc and qemu-system-aarch64 + in qemu-arm + +------------------------------------------------------------------- New: ---- 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch 60-kvm.x86.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ --- /var/tmp/diff_new_pack.dX0PO9/_old 2014-05-17 22:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.dX0PO9/_new 2014-05-17 22:01:32.000000000 +0200 @@ -69,6 +69,7 @@ Patch0042: 0042-qtest-Be-paranoid-about-accept-addr.patch Patch0043: 0043-arm-translate.c-Fix-smlald-Instruct.patch Patch0044: 0044-target-arm-A64-fix-unallocated-test.patch +Patch0045: 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc @@ -166,6 +167,7 @@ %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.dX0PO9/_old 2014-05-17 22:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.dX0PO9/_new 2014-05-17 22:01:32.000000000 +0200 @@ -26,6 +26,16 @@ %else %define build_x86_fw_from_source 0 %endif +%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm aarch64 +%define kvm_available 1 +%else +%define kvm_available 0 +%endif +%ifarch %ix86 x86_64 s390x +%define legacy_qemu_kvm 1 +%else +%define legacy_qemu_kvm 0 +%endif %define noarch_supported 1110 Name: qemu @@ -42,6 +52,7 @@ Source4: qemu-kvm.1.gz Source5: 60-kvm.rules Source6: ksm.service +Source7: 60-kvm.x86.rules # This patch queue is auto-generated from https://github.com/openSUSE/qemu Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch @@ -87,6 +98,7 @@ Patch0042: 0042-qtest-Be-paranoid-about-accept-addr.patch Patch0043: 0043-arm-translate.c-Fix-smlald-Instruct.patch Patch0044: 0044-target-arm-A64-fix-unallocated-test.patch +Patch0045: 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch # Please do not add patches manually here, run update_git.sh. # roms/ipxe patches @@ -156,6 +168,14 @@ %{?systemd_requires} %define with_systemd 1 %endif +%if %{kvm_available} +BuildRequires: udev +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d +%endif +%endif %if 0%{?sles_version} != 11 BuildRequires: usbredir-devel %endif @@ -176,14 +196,6 @@ BuildRequires: spice-protocol-devel %endif %endif -%ifarch %ix86 x86_64 s390x -BuildRequires: udev -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevrulesdir /usr/lib/udev/rules.d -%else -%define _udevrulesdir /lib/udev/rules.d -%endif -%endif Requires: /usr/sbin/groupadd Requires: pwdutils Requires: timezone @@ -297,7 +309,7 @@ This sub-package provides some lesser used emulations, such as moxie and xtensa. -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} %package kvm Url: http://www.linux-kvm.org Summary: Kernel-based Virtual Machine @@ -338,6 +350,8 @@ Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper +Obsoletes: libcacard <= 0.1.2 +Provides: libcacard PreReq: permissions %description tools @@ -350,32 +364,32 @@ This sub-package contains various tools, including a bridge helper. %package -n libcacard0 -Summary: Universal CPU emulator -- Smartcard emulation +Summary: Common Access Card (CAC) emulation Group: System/Emulators/PC %description -n libcacard0 -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains the Smartcard library. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. %package -n libcacard-devel -Summary: Universal CPU emulator -- Smartcard emulation -Group: System/Emulators/PC +Summary: Common Access Card (CAC) emulation -- Development files +Group: Development/Languages/C and C++ Requires: glib2-devel Requires: libcacard0 = %version Requires: mozilla-nspr Requires: mozilla-nss %description -n libcacard-devel -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. This sub-package contains development files for the Smartcard library. @@ -509,6 +523,7 @@ %patch0042 -p1 %patch0043 -p1 %patch0044 -p1 +%patch0045 -p1 %patch1000 -p1 %patch1001 -p1 @@ -544,6 +559,9 @@ %if 0%{?suse_version} >= 1220 --with-gtkabi=3.0 \ %endif +%if %{kvm_available} + --enable-kvm \ +%endif --enable-linux-aio \ --enable-modules \ --enable-sdl \ @@ -592,9 +610,11 @@ %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF' #!/bin/sh @@ -605,16 +625,20 @@ %endif EOF chmod 755 %{buildroot}%{_bindir}/qemu-kvm -%ifarch %ix86 x86_64 +install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup +install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat +install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz +%endif +%if %{kvm_available} %if 0%{?suse_version} >= 1230 install -D -m 644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules %else +%ifarch %ix86 x86_64 +install -D -m 644 %{SOURCE7} %{buildroot}%{_udevrulesdir}/60-kvm.rules +%else install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules %endif %endif -install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup -install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat -install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz %endif install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service %fdupes -s $RPM_BUILD_ROOT @@ -629,7 +653,7 @@ %{_sbindir}/useradd -r -g qemu -G kvm -d / -s /sbin/nologin \ -c "qemu user" qemu -%ifarch %ix86 x86_64 s390x +%if %{kvm_available} %post if [ "$(readlink -f /proc/1/root)" = "/" ]; then /sbin/udevadm control --reload-rules || : @@ -713,7 +737,7 @@ %exclude %_datadir/%name/qemu-ifup %endif %dir %_sysconfdir/%name -%ifarch %ix86 x86_64 +%if %{kvm_available} %if 0%{?suse_version} >= 1230 %{_udevrulesdir}/80-kvm.rules %else @@ -734,6 +758,7 @@ %defattr(-, root, root) %_bindir/qemu-system-ppc %_bindir/qemu-system-ppc64 +%_bindir/qemu-system-ppcemb %_datadir/%name/ppc_rom.bin %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin @@ -750,16 +775,29 @@ %files arm %defattr(-, root, root) %_bindir/qemu-system-arm +%_bindir/qemu-system-aarch64 %files extra %defattr(-, root, root) -%_bindir/qemu-system-* -%exclude %_bindir/qemu-system-i386 -%exclude %_bindir/qemu-system-x86_64 -%exclude %_bindir/qemu-system-ppc -%exclude %_bindir/qemu-system-ppc64 -%exclude %_bindir/qemu-system-s390x -%exclude %_bindir/qemu-system-arm +%_bindir/qemu-system-alpha +%_bindir/qemu-system-cris +%_bindir/qemu-system-lm32 +%_bindir/qemu-system-m68k +%_bindir/qemu-system-microblaze +%_bindir/qemu-system-microblazeel +%_bindir/qemu-system-mips +%_bindir/qemu-system-mipsel +%_bindir/qemu-system-mips64 +%_bindir/qemu-system-mips64el +%_bindir/qemu-system-moxie +%_bindir/qemu-system-or32 +%_bindir/qemu-system-sh4 +%_bindir/qemu-system-sh4eb +%_bindir/qemu-system-sparc +%_bindir/qemu-system-sparc64 +%_bindir/qemu-system-unicore32 +%_bindir/qemu-system-xtensa +%_bindir/qemu-system-xtensaeb %_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 @@ -767,7 +805,7 @@ %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} %files kvm %defattr(-,root,root) %_bindir/qemu-kvm @@ -835,8 +873,6 @@ %defattr(-, root, root) %dir %_includedir/cacard %_includedir/cacard/*.h -%_libdir/libcacard.la -%_libdir/libcacard.a %_libdir/libcacard.so %_libdir/pkgconfig/libcacard.pc ++++++ 0045-tcg-ppc64-Support-the-ELFv2-ABI.patch ++++++ >From 243f0e345cce28c1f93444de33fe7981efdac6dd Mon Sep 17 00:00:00 2001 From: Ulrich Weigand <[email protected]> Date: Tue, 22 Apr 2014 18:26:15 +0200 Subject: [PATCH] tcg-ppc64: Support the ELFv2 ABI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new ELFv2 ABI, used by default on powerpc64le-linux hosts, introduced some changes that are incompatible with code currently generated by the ppc64 TGC target. In particular, we no longer use function descriptors. This patch adds support for the ELFv2 ABI in the ppc64 TGC function call and function prologue sequences. Signed-off-by: Ulrich Weigand <[email protected]> Signed-off-by: Andreas Färber <[email protected]> --- tcg/ppc64/tcg-target.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 06e440f..4ef4838 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -717,6 +717,22 @@ static void tcg_out_call(TCGContext *s, tcg_target_long arg, int const_arg) tcg_out32(s, MTSPR | RS(arg) | LR); tcg_out32(s, BCLR | BO_ALWAYS | LK); } +#elif _CALL_ELF == 2 + /* In the ELFv2 ABI, we do not need to set up the TOC pointer in r2, + but instead we have to set up r12 to contain the destination address + when performing an indirect call. */ + TCGReg reg = arg; + if (const_arg) { + /* FIXME: we could use bl if we knew that the destination uses + the same TOC, and what its local entry point offset is. + For now, always perform an indirect call. */ + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R12, arg); + reg = TCG_REG_R12; + } else { + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_R12, arg); + } + tcg_out32(s, MTSPR | RS(reg) | CTR); + tcg_out32(s, BCCTR | BO_ALWAYS | LK); #else TCGReg reg = arg; int ofs = 0; @@ -1112,7 +1128,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) REG_SAVE_BOT - CPU_TEMP_BUF_NLONGS * sizeof(long), CPU_TEMP_BUF_NLONGS * sizeof(long)); -#ifndef __APPLE__ +#if !defined(__APPLE__) && _CALL_ELF != 2 /* First emit adhoc function descriptor */ tcg_out64(s, (uint64_t)s->code_ptr + 24); /* entry point */ s->code_ptr += 16; /* skip TOC and environment pointer */ ++++++ 60-kvm.rules ++++++ --- /var/tmp/diff_new_pack.dX0PO9/_old 2014-05-17 22:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.dX0PO9/_new 2014-05-17 22:01:32.000000000 +0200 @@ -1,2 +1 @@ KERNEL=="kvm", MODE="0660", GROUP="kvm" -ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'" ++++++ 60-kvm.x86.rules ++++++ KERNEL=="kvm", MODE="0660", GROUP="kvm" ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'" ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.dX0PO9/_old 2014-05-17 22:01:33.000000000 +0200 +++ /var/tmp/diff_new_pack.dX0PO9/_new 2014-05-17 22:01:33.000000000 +0200 @@ -26,6 +26,16 @@ %else %define build_x86_fw_from_source 0 %endif +%ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm aarch64 +%define kvm_available 1 +%else +%define kvm_available 0 +%endif +%ifarch %ix86 x86_64 s390x +%define legacy_qemu_kvm 1 +%else +%define legacy_qemu_kvm 0 +%endif %define noarch_supported 1110 Name: qemu @@ -42,6 +52,7 @@ Source4: qemu-kvm.1.gz Source5: 60-kvm.rules Source6: ksm.service +Source7: 60-kvm.x86.rules # This patch queue is auto-generated from https://github.com/openSUSE/qemu PATCH_FILES # Please do not add patches manually here, run update_git.sh. @@ -113,6 +124,14 @@ %{?systemd_requires} %define with_systemd 1 %endif +%if %{kvm_available} +BuildRequires: udev +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d +%endif +%endif %if 0%{?sles_version} != 11 BuildRequires: usbredir-devel %endif @@ -133,14 +152,6 @@ BuildRequires: spice-protocol-devel %endif %endif -%ifarch %ix86 x86_64 s390x -BuildRequires: udev -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevrulesdir /usr/lib/udev/rules.d -%else -%define _udevrulesdir /lib/udev/rules.d -%endif -%endif Requires: /usr/sbin/groupadd Requires: pwdutils Requires: timezone @@ -254,7 +265,7 @@ This sub-package provides some lesser used emulations, such as moxie and xtensa. -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} %package kvm Url: http://www.linux-kvm.org Summary: Kernel-based Virtual Machine @@ -295,6 +306,8 @@ Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper +Obsoletes: libcacard <= 0.1.2 +Provides: libcacard PreReq: permissions %description tools @@ -307,32 +320,32 @@ This sub-package contains various tools, including a bridge helper. %package -n libcacard0 -Summary: Universal CPU emulator -- Smartcard emulation +Summary: Common Access Card (CAC) emulation Group: System/Emulators/PC %description -n libcacard0 -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains the Smartcard library. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. %package -n libcacard-devel -Summary: Universal CPU emulator -- Smartcard emulation -Group: System/Emulators/PC +Summary: Common Access Card (CAC) emulation -- Development files +Group: Development/Languages/C and C++ Requires: glib2-devel Requires: libcacard0 = %version Requires: mozilla-nspr Requires: mozilla-nss %description -n libcacard-devel -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. This sub-package contains development files for the Smartcard library. @@ -458,6 +471,9 @@ %if 0%{?suse_version} >= 1220 --with-gtkabi=3.0 \ %endif +%if %{kvm_available} + --enable-kvm \ +%endif --enable-linux-aio \ --enable-modules \ --enable-sdl \ @@ -506,9 +522,11 @@ %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF' #!/bin/sh @@ -519,16 +537,20 @@ %endif EOF chmod 755 %{buildroot}%{_bindir}/qemu-kvm -%ifarch %ix86 x86_64 +install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup +install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat +install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz +%endif +%if %{kvm_available} %if 0%{?suse_version} >= 1230 install -D -m 644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules %else +%ifarch %ix86 x86_64 +install -D -m 644 %{SOURCE7} %{buildroot}%{_udevrulesdir}/60-kvm.rules +%else install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules %endif %endif -install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup -install -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/kvm_stat -install -D -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz %endif install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service %fdupes -s $RPM_BUILD_ROOT @@ -543,7 +565,7 @@ %{_sbindir}/useradd -r -g qemu -G kvm -d / -s /sbin/nologin \ -c "qemu user" qemu -%ifarch %ix86 x86_64 s390x +%if %{kvm_available} %post if [ "$(readlink -f /proc/1/root)" = "/" ]; then /sbin/udevadm control --reload-rules || : @@ -627,7 +649,7 @@ %exclude %_datadir/%name/qemu-ifup %endif %dir %_sysconfdir/%name -%ifarch %ix86 x86_64 +%if %{kvm_available} %if 0%{?suse_version} >= 1230 %{_udevrulesdir}/80-kvm.rules %else @@ -648,6 +670,7 @@ %defattr(-, root, root) %_bindir/qemu-system-ppc %_bindir/qemu-system-ppc64 +%_bindir/qemu-system-ppcemb %_datadir/%name/ppc_rom.bin %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin @@ -664,16 +687,29 @@ %files arm %defattr(-, root, root) %_bindir/qemu-system-arm +%_bindir/qemu-system-aarch64 %files extra %defattr(-, root, root) -%_bindir/qemu-system-* -%exclude %_bindir/qemu-system-i386 -%exclude %_bindir/qemu-system-x86_64 -%exclude %_bindir/qemu-system-ppc -%exclude %_bindir/qemu-system-ppc64 -%exclude %_bindir/qemu-system-s390x -%exclude %_bindir/qemu-system-arm +%_bindir/qemu-system-alpha +%_bindir/qemu-system-cris +%_bindir/qemu-system-lm32 +%_bindir/qemu-system-m68k +%_bindir/qemu-system-microblaze +%_bindir/qemu-system-microblazeel +%_bindir/qemu-system-mips +%_bindir/qemu-system-mipsel +%_bindir/qemu-system-mips64 +%_bindir/qemu-system-mips64el +%_bindir/qemu-system-moxie +%_bindir/qemu-system-or32 +%_bindir/qemu-system-sh4 +%_bindir/qemu-system-sh4eb +%_bindir/qemu-system-sparc +%_bindir/qemu-system-sparc64 +%_bindir/qemu-system-unicore32 +%_bindir/qemu-system-xtensa +%_bindir/qemu-system-xtensaeb %_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 @@ -681,7 +717,7 @@ %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin -%ifarch %ix86 x86_64 s390x +%if %{legacy_qemu_kvm} %files kvm %defattr(-,root,root) %_bindir/qemu-kvm @@ -749,8 +785,6 @@ %defattr(-, root, root) %dir %_includedir/cacard %_includedir/cacard/*.h -%_libdir/libcacard.la -%_libdir/libcacard.a %_libdir/libcacard.so %_libdir/pkgconfig/libcacard.pc -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
