[qemu/private-bonzini-el6: 5/19] Merge branch 'master' (early part) into el6

[bonzini]

commit 00ed039f56dda89dae60b97f426ccce4ae3f6558
Merge: 9661186 156e0fb
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Fri Nov 16 13:43:22 2012 +0100

    Merge branch 'master' (early part) into el6
    
    Conflicts:
    	qemu.spec

 ...gure-Fix-CONFIG_QEMU_HELPERDIR-generation.patch |   31 ++++++++++++++++++++
 bridge.conf                                        |    1 +
 qemu.spec                                          |   22 +++++++++++++-
 3 files changed, 53 insertions(+), 1 deletions(-)
---
diff --cc qemu.spec
index 1fc7606,6e9d270..0357107
--- a/qemu.spec
+++ b/qemu.spec
@@@ -247,7 -148,7 +247,8 @@@ Source9: ksmtuned.con
  
  Source10: qemu-guest-agent.service
  Source11: 99-qemu-guest-agent.rules
 +Source66610: qemu-ga.init
+ Source12: bridge.conf
  
  # Patches queued for 1.2.1 stable
  Patch0001: 0001-target-xtensa-convert-host-errno-values-to-guest.patch
@@@ -1633,27 -1480,11 +1637,31 @@@ mkdir -p $RPM_BUILD_ROOT%{_unitdir
  mkdir -p $RPM_BUILD_ROOT%{_udevdir}
  install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}
  install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_udevdir}
 +%else
 +# For the qemu-guest-agent subpackage install the service
 +mkdir -p $RPM_BUILD_ROOT%{_initddir}
 +install -D -p -m 0755 %{SOURCE66610} $RPM_BUILD_ROOT%{_initddir}/qemu-ga
 +%endif
 +
 +%if %{with separate_kvm}
 +rm $RPM_BUILD_ROOT%{_bindir}/qemu-img
 +rm $RPM_BUILD_ROOT%{_bindir}/qemu-io
 +rm $RPM_BUILD_ROOT%{_bindir}/vscclient
 +rm $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1*
 +
 +rm $RPM_BUILD_ROOT%{_bindir}/qemu-ga
 +%if %{with systemd}
 +rm $RPM_BUILD_ROOT%{_unitdir}/qemu-guest-agent.service
 +rm $RPM_BUILD_ROOT%{_udevdir}/99-qemu-guest-agent.rules
 +%else
 +rm $RPM_BUILD_ROOT%{_initddir}/qemu-ga
 +%endif
 +%endif
  
+ # Install rules to use the bridge helper with libvirt's virbr0
+ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/qemu
+ chmod u+s $RPM_BUILD_ROOT%{_libexecdir}/qemu-bridge-helper
+ 
  %check
  make check
  
@@@ -1782,40 -1574,15 +1790,41 @@@ f
  %{_bindir}/virtfs-proxy-helper
  %{_libexecdir}/qemu-bridge-helper
  %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf
 +%if %{without separate_kvm}
 +%if %{with systemd}
  /lib/systemd/system/ksm.service
  /lib/systemd/ksmctl
 +%else
 +%{_initddir}/ksm
 +%endif
  %config(noreplace) %{_sysconfdir}/sysconfig/ksm
 +%if %{with systemd}
  /lib/systemd/system/ksmtuned.service
 +%else
 +%{_initddir}/ksmtuned
 +%endif
  %{_sbindir}/ksmtuned
  %config(noreplace) %{_sysconfdir}/ksmtuned.conf
 +%else
 +%if %{with systemd}
 +%exclude /lib/systemd/system/ksm.service
 +%exclude /lib/systemd/ksmctl
 +%else
 +%exclude %{_initddir}/ksm
 +%endif
 +%config(noreplace) %{_sysconfdir}/sysconfig/ksm
 +%if %{with systemd}
 +%exclude /lib/systemd/system/ksmtuned.service
 +%else
 +%exclude %{_initddir}/ksmtuned
 +%endif
 +%exclude %{_sbindir}/ksmtuned
 +%exclude %config(noreplace) %{_sysconfdir}/ksmtuned.conf
 +%endif
  %dir %{_sysconfdir}/qemu
+ %config(noreplace) %{_sysconfdir}/qemu/bridge.conf
  
 +%if %{without separate_kvm}
  %files guest-agent
  %defattr(-,root,root,-)
  %doc COPYING README
@@@ -2071,20 -1817,19 +2080,31 @@@
  %{_bindir}/qemu-io
  %{_bindir}/vscclient
  %{_mandir}/man1/qemu-img.1*
 +%endif
  
  %changelog
+ * Fri Nov 16 2012 Paolo Bonzini <pbonzini at redhat.com> - 2:1.2.0-22
+ - Fix previous commit
+ 
+ * Fri Nov 16 2012 Paolo Bonzini <pbonzini at redhat.com> - 2:1.2.0-21
+ - Backport commit 38f419f (configure: Fix CONFIG_QEMU_HELPERDIR generation,
+   2012-10-17)
+ 
+ * Thu Nov 15 2012 Paolo Bonzini <pbonzini at redhat.com> - 2:1.2.0-20
+ - Install qemu-bridge-helper as suid root
+ - Distribute a sample /etc/qemu/bridge.conf file
+ 
 +* Thu Nov 11 2012 Lubomir Rintel <lkundrak at v3.sk> - 2:1.2.0-19.1
 +- Add EPEL 6 support
 +- Allow building a package that is able to coexist with el6's kvm package
 +- Require gpxe-roms-qemu in EPEL6
 +- Allow builds without usbredir
 +- Allow builds without xfsprogs
 +- Do not stick certain dependencies to exact revisions
 +- Allow building without libfdt
 +- Allow builds with intree firmware
 +- Bring back sysvinit support
 +
  * Thu Nov  1 2012 Hans de Goede <hdegoede at redhat.com> - 2:1.2.0-19
  - Sync spice patches with upstream, minor bugfixes and set the qxl pci
    device revision to 4 by default, so that guests know they can use