Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-06-29 11:34:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu", Maintainer is "BROGERS(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-06-25 12:01:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-06-29 11:34:36.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Jun 25 19:29:05 UTC 2012 - afaerber(a)suse.de
+
+- include qemu-img and qemu-nbd in qemu-tools package
+
+-------------------------------------------------------------------
+Wed Jun 25 18:30:54 UTC 2012 - afaerber(a)suse.de
+
+- add qemu-guest-agent package
+
+-------------------------------------------------------------------
+Mon Jun 25 17:40:36 UTC 2012 - agraf(a)suse.com
+
+- add fix for segv in linux-user (fixes java)
+
+-------------------------------------------------------------------
New:
----
0024-linux-user-fix-segmentation-fault-p.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.j3AOOr/_old 2012-06-29 11:34:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j3AOOr/_new 2012-06-29 11:34:37.000000000 +0200
@@ -47,6 +47,7 @@
Patch0021: 0021-linux-user-fix-multi-threaded-proc-.patch
Patch0022: 0022-use-libexecdir-instead-of-ignoring-.patch
Patch0023: 0023-linux-user-Ignore-broken-loop-ioctl.patch
+Patch0024: 0024-linux-user-fix-segmentation-fault-p.patch
# this is to make lint happy
Source300: rpmlintrc
Source302: bridge.conf
@@ -97,9 +98,8 @@
BuildRequires: python
Requires: /usr/sbin/groupadd
Requires: pwdutils
-Requires: qemu-tools
Requires: timezone
-Requires: virt-utils
+Recommends: qemu-tools
%description
QEMU is an extremely well-performing CPU emulator that allows you to
@@ -123,6 +123,20 @@
This sub-package contains various tools, including a bridge helper.
+%package guest-agent
+Summary: Universal CPU emulator -- Guest agent
+Group: System/Emulators/PC
+Provides: qemu:%_bindir/qemu-ga
+
+%description guest-agent
+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 guest agent.
+
%package linux-user
Summary: Universal CPU emulator -- Linux User binaries
Group: System/Emulators/PC
@@ -164,6 +178,7 @@
%patch0021 -p1
%patch0022 -p1
%patch0023 -p1
+%patch0024 -p1
%build
# build QEMU
@@ -185,7 +200,10 @@
--disable-spice
%endif
make %{?jobs:-j%jobs} V=1
-mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true
+mv *-softmmu/qemu-system-* dynamic
+mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
+mv qemu-img.1 qemu-nbd.8 dynamic
+mv qemu-ga dynamic
make clean
# build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -202,15 +220,20 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
-rm -f $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
+install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
+install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
+install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
+install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
@@ -242,7 +265,7 @@
%defattr(-, root, root)
%doc COPYING COPYING.LIB Changelog README TODO VERSION qemu-doc.html qemu-tech.html
%_bindir/qemu-system-*
-%doc %_mandir/man[18]/qemu*.[18].gz
+%doc %_mandir/man1/qemu.1.gz
%_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
@@ -252,10 +275,19 @@
%files tools
%defattr(-, root, root)
+%doc %_mandir/man1/qemu-img.1.gz
+%doc %_mandir/man8/qemu-nbd.8.gz
%_bindir/qemu-io
+%_bindir/qemu-img
+%_bindir/qemu-nbd
%verify(not mode) %_libexecdir/qemu-bridge-helper
+%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
+%files guest-agent
+%defattr(-, root, root)
+%attr(755,root,kvm) %_bindir/qemu-ga
+
%files linux-user
%defattr(-, root, root)
%_bindir/qemu-alpha
++++++ 0019-linux-user-ARM-Ignore-immediate-val.patch ++++++
--- /var/tmp/diff_new_pack.j3AOOr/_old 2012-06-29 11:34:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j3AOOr/_new 2012-06-29 11:34:37.000000000 +0200
@@ -1,8 +1,7 @@
From 8cc5120497695e7ea8dde9b096eb6c8cb9b6ac35 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Tue, 29 May 2012 17:28:07 +0200
-Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb
- mode
+Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb mode
When running in thumb mode, Linux doesn't evaluate the immediate value
of the svc instruction, but instead just always assumes the syscall number
++++++ 0022-use-libexecdir-instead-of-ignoring-.patch ++++++
--- /var/tmp/diff_new_pack.j3AOOr/_old 2012-06-29 11:34:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j3AOOr/_new 2012-06-29 11:34:37.000000000 +0200
@@ -1,10 +1,9 @@
From 57fd4d50146ef90693d569ee799f7e9e9d606e05 Mon Sep 17 00:00:00 2001
From: Michael Tokarev <mjt(a)tls.msk.ru>
Date: Thu, 7 Jun 2012 01:11:00 +0400
-Subject: [PATCH] use --libexecdir instead of ignoring it first and
- reinventing it later
+Subject: [PATCH] use --libexecdir instead of ignoring it first and reinventing it later
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Commit 7b93fadf3a38d1ed65ea5536a52efc2772c6e3b8 "Add basic version
++++++ 0024-linux-user-fix-segmentation-fault-p.patch ++++++
>From c42b3aca84c5b1a8be7010e518f526a1798e3790 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf(a)suse.de>
Date: Mon, 25 Jun 2012 19:02:32 +0200
Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x
When forwarding a segmentation fault into the guest process, we were passing
the host's address directly into the guest process's signal descriptor.
That obviously confused the guest process, since it didn't know what to make
of the (usually 32-bit truncated) address. Passing in g2h(address) makes the
guest process a lot happier.
This fixes java running in arm-linux-user for me.
Signed-off-by: Alexander Graf <agraf(a)suse.de>
---
user-exec.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/user-exec.c b/user-exec.c
index 36d29b4..83d2d44 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -100,19 +100,20 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
/* Maybe we're still holding the TB fiddling lock? */
spin_unlock_safe(&tb_lock);
- /* XXX: locking issue */
- if (is_write && h2g_valid(address)
- && page_unprotect(h2g(address), pc, puc)) {
- return 1;
- }
+ if (h2g_valid(address)) {
+ /* XXX: locking issue */
+ if (is_write && page_unprotect(h2g(address), pc, puc)) {
+ return 1;
+ }
- /* see if it is an MMU fault */
- ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX);
- if (ret < 0) {
- return 0; /* not an MMU fault */
- }
- if (ret == 0) {
- return 1; /* the MMU fault was handled without causing real CPU fault */
+ /* see if it is an MMU fault */
+ ret = cpu_handle_mmu_fault(env, h2g(address), is_write, MMU_USER_IDX);
+ if (ret < 0) {
+ return 0; /* not an MMU fault */
+ }
+ if (ret == 0) {
+ return 1; /* the MMU fault was handled without causing real CPU fault */
+ }
}
/* now we have a real cpu fault */
tb = tb_find_pc(pc);
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.j3AOOr/_old 2012-06-29 11:34:37.000000000 +0200
+++ /var/tmp/diff_new_pack.j3AOOr/_new 2012-06-29 11:34:37.000000000 +0200
@@ -74,10 +74,9 @@
BuildRequires: pwdutils
BuildRequires: python
Requires: pwdutils
-Requires: qemu-tools
Requires: timezone
-Requires: virt-utils
Requires: /usr/sbin/groupadd
+Recommends: qemu-tools
%description
QEMU is an extremely well-performing CPU emulator that allows you to
@@ -101,6 +100,20 @@
This sub-package contains various tools, including a bridge helper.
+%package guest-agent
+Summary: Universal CPU emulator -- Guest agent
+Group: System/Emulators/PC
+Provides: qemu:%_bindir/qemu-ga
+
+%description guest-agent
+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 guest agent.
+
%package linux-user
Summary: Universal CPU emulator -- Linux User binaries
Group: System/Emulators/PC
@@ -141,7 +154,10 @@
--disable-spice
%endif
make %{?jobs:-j%jobs} V=1
-mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true
+mv *-softmmu/qemu-system-* dynamic
+mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
+mv qemu-img.1 qemu-nbd.8 dynamic
+mv qemu-ga dynamic
make clean
# build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -158,15 +174,20 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
-rm -f $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
+install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
+install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
+install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
+install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
@@ -198,7 +219,7 @@
%defattr(-, root, root)
%doc COPYING COPYING.LIB Changelog README TODO VERSION qemu-doc.html qemu-tech.html
%_bindir/qemu-system-*
-%doc %_mandir/man[18]/qemu*.[18].gz
+%doc %_mandir/man1/qemu.1.gz
%_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
@@ -208,10 +229,19 @@
%files tools
%defattr(-, root, root)
+%doc %_mandir/man1/qemu-img.1.gz
+%doc %_mandir/man8/qemu-nbd.8.gz
%_bindir/qemu-io
+%_bindir/qemu-img
+%_bindir/qemu-nbd
%verify(not mode) %_libexecdir/qemu-bridge-helper
+%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
+%files guest-agent
+%defattr(-, root, root)
+%attr(755,root,kvm) %_bindir/qemu-ga
+
%files linux-user
%defattr(-, root, root)
%_bindir/qemu-alpha
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
