diff options
| author | Kevin Wolf | 2016-10-07 14:17:11 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2016-10-07 14:17:11 +0200 |
| commit | 9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8 (patch) | |
| tree | efe15b0952ffe7eeec72c103479ca77d6a422837 /scripts/modules | |
| parent | block: Add qdev ID to DEVICE_TRAY_MOVED (diff) | |
| parent | dmg: Move libbz2 code to dmg-bz2.so (diff) | |
| download | qemu-9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8.tar.gz qemu-9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8.tar.xz qemu-9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2016-10-07' into queue-block
Block patches for the block queue.
# gpg: Signature made Fri Oct 7 14:14:45 2016 CEST
# gpg: using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* mreitz/tags/pull-block-2016-10-07:
dmg: Move libbz2 code to dmg-bz2.so
module: Don't load the same module if requested multiple times
scripts: Allow block module to not define BlockDriver
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'scripts/modules')
| -rw-r--r-- | scripts/modules/module_block.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/modules/module_block.py b/scripts/modules/module_block.py index db4fb540cd..3f73007640 100644 --- a/scripts/modules/module_block.py +++ b/scripts/modules/module_block.py @@ -37,7 +37,6 @@ def add_module(fheader, library, format_name, protocol_name): 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: @@ -51,16 +50,10 @@ def process_file(fheader, filename): 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 */ /* |