[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/60] pr-manager: put stubs in .c file
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/60] pr-manager: put stubs in .c file |
Date: |
Thu, 28 Jun 2018 22:04:45 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/scsi/pr-manager.h | 9 ---------
scsi/Makefile.objs | 1 +
scsi/pr-manager-stub.c | 24 ++++++++++++++++++++++++
3 files changed, 25 insertions(+), 9 deletions(-)
create mode 100644 scsi/pr-manager-stub.c
diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h
index 5d2f13a..71971ae 100644
--- a/include/scsi/pr-manager.h
+++ b/include/scsi/pr-manager.h
@@ -41,15 +41,6 @@ BlockAIOCB *pr_manager_execute(PRManager *pr_mgr,
BlockCompletionFunc *complete,
void *opaque);
-#ifdef CONFIG_LINUX
PRManager *pr_manager_lookup(const char *id, Error **errp);
-#else
-static inline PRManager *pr_manager_lookup(const char *id, Error **errp)
-{
- /* The classes do not exist at all! */
- error_setg(errp, "No persistent reservation manager with id '%s'", id);
- return NULL;
-}
-#endif
#endif
diff --git a/scsi/Makefile.objs b/scsi/Makefile.objs
index 4d25e47..bb8789c 100644
--- a/scsi/Makefile.objs
+++ b/scsi/Makefile.objs
@@ -1,3 +1,4 @@
block-obj-y += utils.o
block-obj-$(CONFIG_LINUX) += pr-manager.o pr-manager-helper.o
+block-obj-$(call lnot,$(CONFIG_LINUX)) += pr-manager-stub.o
diff --git a/scsi/pr-manager-stub.c b/scsi/pr-manager-stub.c
new file mode 100644
index 0000000..632f17c
--- /dev/null
+++ b/scsi/pr-manager-stub.c
@@ -0,0 +1,24 @@
+/*
+ * Persistent reservation manager - stub for non-Linux platforms
+ *
+ * Copyright (c) 2018 Red Hat, Inc.
+ *
+ * Author: Paolo Bonzini <address@hidden>
+ *
+ * This code is licensed under the LGPL.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "scsi/pr-manager.h"
+#include "trace.h"
+#include "qapi/qapi-types-block.h"
+#include "qapi/qapi-commands-block.h"
+
+PRManager *pr_manager_lookup(const char *id, Error **errp)
+{
+ /* The classes do not exist at all! */
+ error_setg(errp, "No persistent reservation manager with id '%s'", id);
+ return NULL;
+}
--
1.8.3.1
- [Qemu-devel] [PULL 26/60] nvdimm: convert nvdimm_mr into a pointer, (continued)
- [Qemu-devel] [PULL 26/60] nvdimm: convert nvdimm_mr into a pointer, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 27/60] nvdimm: make get_memory_region() perform checks and initialization, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 28/60] pc-dimm: get_memory_region() will not fail after realize, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 29/60] numa: report all DIMM/NVDIMMs as plugged memory, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 31/60] Deprecate the -enable-hax option, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 30/60] osdep: work around Coverity parsing errors, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 32/60] pr-helper: fix --socket-path default in help, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 33/60] pr-helper: fix assertion failure on failed multipath PERSISTENT RESERVE IN, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 34/60] pr-manager-helper: avoid SIGSEGV when writing to the socket fail, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 35/60] pr-manager: put stubs in .c file,
Paolo Bonzini <=
- [Qemu-devel] [PULL 40/60] WHPX workaround bug in OSVW handling, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 36/60] pr-manager: add query-pr-managers QMP command, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 39/60] esp: remove legacy esp_init() function, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 38/60] hw/mips/jazz: create ESP device directly via qdev, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 37/60] pr-manager-helper: report event on connection/disconnection, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 41/60] WHPX: register for unrecognized MSR exits, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 43/60] target-i386: Add NMI interception to SVM, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 42/60] memory/hmp: Print owners/parents in "info mtree", Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 48/60] ioapic: some proper indents when dump info, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 46/60] doc: another fix to "info pic", Paolo Bonzini, 2018/06/28