[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 4/8] blockdev: Add dynamic generation of module_bl
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL v2 4/8] blockdev: Add dynamic generation of module_block.h |
Date: |
Sun, 18 Sep 2016 00:06:01 +0200 |
From: Marc Mari <address@hidden>
To simplify the addition of new block modules, add a script that generates
module_block.h automatically from the modules' source code.
This script assumes that the QEMU coding style rules are followed.
Signed-off-by: Marc MarĂ <address@hidden>
Signed-off-by: Colin Lord <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
Makefile | 7 +++
scripts/modules/module_block.py | 108 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
create mode 100644 scripts/modules/module_block.py
diff --git a/Makefile b/Makefile
index 1fad5b7..f2c3b24 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,8 @@ GENERATED_HEADERS += trace/generated-ust-provider.h
GENERATED_SOURCES += trace/generated-ust.c
endif
+GENERATED_HEADERS += module_block.h
+
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
@@ -353,6 +355,11 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y)
libqemuutil.a libqemustub.a
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
+module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
+ $(call quiet-command,$(PYTHON) $< $@ \
+ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
+ " GEN $@")
+
clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h
gen-op-arm.h
diff --git a/scripts/modules/module_block.py b/scripts/modules/module_block.py
new file mode 100644
index 0000000..db4fb54
--- /dev/null
+++ b/scripts/modules/module_block.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+#
+# Module information generator
+#
+# Copyright Red Hat, Inc. 2015 - 2016
+#
+# Authors:
+# Marc Mari <address@hidden>
+#
+# This work is licensed under the terms of the GNU GPL, version 2.
+# See the COPYING file in the top-level directory.
+
+from __future__ import print_function
+import sys
+import os
+
+def get_string_struct(line):
+ data = line.split()
+
+ # data[0] -> struct element name
+ # data[1] -> =
+ # data[2] -> value
+
+ return data[2].replace('"', '')[:-1]
+
+def add_module(fheader, library, format_name, protocol_name):
+ lines = []
+ lines.append('.library_name = "' + library + '",')
+ if format_name != "":
+ lines.append('.format_name = "' + format_name + '",')
+ if protocol_name != "":
+ lines.append('.protocol_name = "' + protocol_name + '",')
+
+ text = '\n '.join(lines)
+ fheader.write('\n {\n ' + text + '\n },')
+
+def process_file(fheader, filename):
+ # This parser assumes the coding style rules are being followed
+ with open(filename, "r") as cfile:
+ found_something = False
+ found_start = False
+ library, _ = os.path.splitext(os.path.basename(filename))
+ for line in cfile:
+ if found_start:
+ line = line.replace('\n', '')
+ if line.find(".format_name") != -1:
+ format_name = get_string_struct(line)
+ elif line.find(".protocol_name") != -1:
+ protocol_name = get_string_struct(line)
+ elif line == "};":
+ add_module(fheader, library, format_name, protocol_name)
+ found_start = False
+ elif line.find("static BlockDriver") != -1:
+ found_something = True
+ found_start = True
+ format_name = ""
+ protocol_name = ""
+
+ if not found_something:
+ print("No BlockDriver struct found in " + filename + ". \
+ Is this really a module?", file=sys.stderr)
+ sys.exit(1)
+
+def print_top(fheader):
+ fheader.write('''/* AUTOMATICALLY GENERATED, DO NOT MODIFY */
+/*
+ * QEMU Block Module Infrastructure
+ *
+ * Authors:
+ * Marc Mari <address@hidden>
+ */
+
+''')
+
+ fheader.write('''#ifndef QEMU_MODULE_BLOCK_H
+#define QEMU_MODULE_BLOCK_H
+
+#include "qemu-common.h"
+
+static const struct {
+ const char *format_name;
+ const char *protocol_name;
+ const char *library_name;
+} block_driver_modules[] = {''')
+
+def print_bottom(fheader):
+ fheader.write('''
+};
+
+#endif
+''')
+
+# First argument: output file
+# All other arguments: modules source files (.c)
+output_file = sys.argv[1]
+with open(output_file, 'w') as fheader:
+ print_top(fheader)
+
+ for filename in sys.argv[2:]:
+ if os.path.isfile(filename):
+ process_file(fheader, filename)
+ else:
+ print("File " + filename + " does not exist.", file=sys.stderr)
+ sys.exit(1)
+
+ print_bottom(fheader)
+
+sys.exit(0)
--
2.9.3
- [Qemu-devel] [PULL v2 0/8] Block layer patches, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 1/8] qemu-img: add the 'dd' subcommand, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 3/8] blockdev: prepare iSCSI block driver for dynamic loading, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 4/8] blockdev: Add dynamic generation of module_block.h,
Max Reitz <=
- [Qemu-devel] [PULL v2 2/8] qemu-img: add skip option to dd, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 5/8] blockdev: Add dynamic module loading for block drivers, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 6/8] blockdev: Modularize nfs block driver, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 7/8] commit: get the overlay node before manipulating the backing chain, Max Reitz, 2016/09/17
- [Qemu-devel] [PULL v2 8/8] iotest 055: refactor and speed up, Max Reitz, 2016/09/17
- Re: [Qemu-devel] [PULL v2 0/8] Block layer patches, Peter Maydell, 2016/09/19