diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 16:34:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 16:34:26 +0000 |
| commit | 940a8ce075e3408742a4edcabfd6c2a15e2539eb (patch) | |
| tree | 2123c42b0e9ae5b916c4c9d6d8cd6ace39f595b2 /include | |
| parent | 373967b2ed630c80462ef2847709fb93f33b8951 (diff) | |
| parent | b3d3a426da9b067366bc132d53a6fa6b72675b55 (diff) | |
| download | qemu-940a8ce075e3408742a4edcabfd6c2a15e2539eb.zip qemu-940a8ce075e3408742a4edcabfd6c2a15e2539eb.tar.gz qemu-940a8ce075e3408742a4edcabfd6c2a15e2539eb.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
fixes for 2.9-rc1, plus removal of -mno-cygwin references
# gpg: Signature made Mon 20 Mar 2017 11:25:07 GMT
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
hax: fix breakage in locking
configure: remove Cygwin
xen: do not build backends for targets that do not support xen
qemu-ga: obey LISTEN_PID when using systemd socket activation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/systemd.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/include/qemu/systemd.h b/include/qemu/systemd.h new file mode 100644 index 0000000..e6a877e --- /dev/null +++ b/include/qemu/systemd.h @@ -0,0 +1,26 @@ +/* + * systemd socket activation support + * + * Copyright 2017 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Richard W.M. Jones <rjones@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_SYSTEMD_H +#define QEMU_SYSTEMD_H 1 + +#define FIRST_SOCKET_ACTIVATION_FD 3 /* defined by systemd ABI */ + +/* + * Check if socket activation was requested via use of the + * LISTEN_FDS and LISTEN_PID environment variables. + * + * Returns 0 if no socket activation, or the number of FDs. + */ +unsigned int check_socket_activation(void); + +#endif |