From 1ad1f9a1d12311cde5b432bfcdfc2d1457c18049 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 5 Oct 2011 16:00:36 +0100
Subject: [PATCH] Fix packaging of the QEMU guest agent

The binary 'qemu-ga' is not a userspace emulator, it is the
QEMU guest agent. Since this typically needs to be installed
in the guest put it in a sub-RPM.

A systemd service is used to start the agent. A udev rule is
used to automatically start the systemd service, if the
corresponding virtio-serial port is present
---
 99-qemu-guest-agent.rules |  2 ++
 qemu-guest-agent.service  | 11 +++++++
 qemu.spec                 | 63 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 99-qemu-guest-agent.rules
 create mode 100644 qemu-guest-agent.service

diff --git a/99-qemu-guest-agent.rules b/99-qemu-guest-agent.rules
new file mode 100644
index 0000000..8a290ab
--- /dev/null
+++ b/99-qemu-guest-agent.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
+  TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
diff --git a/qemu-guest-agent.service b/qemu-guest-agent.service
new file mode 100644
index 0000000..51cd7b3
--- /dev/null
+++ b/qemu-guest-agent.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=QEMU Guest Agent
+BindTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+
+[Service]
+ExecStart=-/usr/bin/qemu-ga
+Restart=always
+RestartSec=0
+
+[Install]
diff --git a/qemu.spec b/qemu.spec
index f6fa6b4..c8ccbd8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.15.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -34,6 +34,9 @@ Source6: ksmtuned.init
 Source7: ksmtuned
 Source8: ksmtuned.conf
 
+Source10: qemu-guest-agent.service
+Source11: 99-qemu-guest-agent.rules
+
 # Amit's flow control patches, waiting to glib conversion before going upstream
 Patch01: 0001-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch
 Patch02: 0002-char-Add-a-QemuChrHandlers-struct-to-initialise-char.patch
@@ -148,6 +151,43 @@ emulation speed by using dynamic translation.
 
 This package provides the common files needed by all QEMU targets
 
+%package guest-agent
+Summary: QEMU guest agent
+Group: System Environment/Daemons
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+%description guest-agent
+QEMU is a generic and open source processor emulator which achieves a good
+emulation speed by using dynamic translation.
+
+This package provides an agent to run inside guests, which communicates
+with the host over a virtio-serial channel named "org.qemu.guest_agent.0"
+
+This package does not need to be installed on the host OS.
+
+%post guest-agent
+if [ $1 -eq 1 ] ; then
+    # Initial installation.
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun guest-agent
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade.
+    /bin/systemctl stop qemu-guest-agent.service > /dev/null 2>&1 || :
+fi
+
+%postun guest-agent
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall.
+    /bin/systemctl try-restart qemu-guest-agent.service >/dev/null 2>&1 || :
+fi
+
+
+
 %package user
 Summary: QEMU user mode emulation of qemu targets
 Group: Development/Tools
@@ -429,6 +469,16 @@ ln -s ../vgabios/VGABIOS-lgpl-latest.qxl.bin %{buildroot}/%{_datadir}/%{name}/vg
 ln -s ../vgabios/VGABIOS-lgpl-latest.stdvga.bin %{buildroot}/%{_datadir}/%{name}/vgabios-stdvga.bin
 ln -s ../vgabios/VGABIOS-lgpl-latest.vmware.bin %{buildroot}/%{_datadir}/%{name}/vgabios-vmware.bin
 ln -s ../seabios/bios.bin %{buildroot}/%{_datadir}/%{name}/bios.bin
+
+
+# For the qemu-guest-agent subpackage install the systemd
+# service and udev rules.
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -507,12 +557,18 @@ fi
 %config(noreplace) %{_sysconfdir}/ksmtuned.conf
 %dir %{_sysconfdir}/qemu
 
+%files guest-agent
+%defattr(-,root,root,-)
+%doc COPYING README
+%{_bindir}/qemu-ga
+%{_unitdir}/qemu-guest-agent.service
+%{_sysconfdir}/udev/rules.d/99-qemu-guest-agent.rules
+
 %files user
 %defattr(-,root,root)
 %{_initddir}/qemu
 %{_bindir}/qemu-i386
 %{_bindir}/qemu-x86_64
-%{_bindir}/qemu-ga
 %if !%{with_x86only}
 %{_bindir}/qemu-alpha
 %{_bindir}/qemu-arm
@@ -619,6 +675,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Oct  5 2011 Daniel P. Berrange <berrange@redhat.com> - 2:0.15.0-5
+- Create a qemu-guest-agent sub-RPM for guest installation
+
 * Tue Sep 13 2011 Daniel P. Berrange <berrange@redhat.com> - 2:0.15.0-4
 - Enable DTrace tracing backend for SystemTAP (rhbz #737763)
 - Enable build with curl (rhbz #737006)