|
 |
357786 |
From 0901cd0ef66131ea6fe93654b0ceb1feaad9a0e5 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Date: Thu, 12 Oct 2017 13:54:45 +0200
|
|
|
357786 |
Subject: osdep: Force define F_OFD_GETLK (RHEL only)
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Message-id: <20171012135445.4214-1-famz@redhat.com>
|
|
|
357786 |
Patchwork-id: 77220
|
|
|
357786 |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH] osdep: Force define F_OFD_GETLK (RHEL only)
|
|
|
357786 |
Bugzilla: 1378241
|
|
|
357786 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
357786 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
357786 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
BZ: 1378241
|
|
|
357786 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=14254218
|
|
|
357786 |
|
|
|
357786 |
glibc is not ready yet (BZ 1461231, which is deferred to 7.6 due to
|
|
|
357786 |
capacity), so the OFD constants are not defined in the system headers we
|
|
|
357786 |
pull in. (They do exist in the headers of latest kernel-headers package,
|
|
|
357786 |
but we don't want to include that anyway.)
|
|
|
357786 |
|
|
|
357786 |
Actually the constants are all that are missing before we can call image
|
|
|
357786 |
locking done in 7.5, so there is no reason to wait for glibc.
|
|
|
357786 |
|
|
|
357786 |
This patch can be reverted once the new glibc headers are in place.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
(cherry picked from commit ac74b9067d079b03f3fe4236270f9eb34121009b)
|
|
|
357786 |
(cherry picked from commit ae5b5b95b3a6ba4d1d9fb424cf95205e43f2ad67)
|
|
|
357786 |
(cherry picked from commit f380fac7d927459c3675dabd125be8a379f43a2c)
|
|
|
357786 |
(cherry picked from commit fb92cc1c98ff118afbc18ca1c22379ab3cf76f7a)
|
|
|
357786 |
---
|
|
|
357786 |
util/osdep.c | 5 +++++
|
|
|
357786 |
1 file changed, 5 insertions(+)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/util/osdep.c b/util/osdep.c
|
|
|
357786 |
index a73de0e..0dbe6ec 100644
|
|
|
357786 |
--- a/util/osdep.c
|
|
|
357786 |
+++ b/util/osdep.c
|
|
|
357786 |
@@ -23,6 +23,11 @@
|
|
|
357786 |
*/
|
|
|
357786 |
#include "qemu/osdep.h"
|
|
|
357786 |
|
|
|
357786 |
+#ifndef F_OFD_SETLK
|
|
|
357786 |
+#define F_OFD_GETLK 36
|
|
|
357786 |
+#define F_OFD_SETLK 37
|
|
|
357786 |
+#endif
|
|
|
357786 |
+
|
|
|
357786 |
/* Needed early for CONFIG_BSD etc. */
|
|
|
357786 |
|
|
|
357786 |
#ifdef CONFIG_SOLARIS
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|