Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] blockdev: Add dynamic generation of module_block.h

[Stefan Hajnoczi <stefanha@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3041 bytes --]

On Thu, Jun 16, 2016 at 09:57:20AM -0400, Colin Lord wrote:
> On 06/16/2016 12:59 AM, Fam Zheng wrote:
> > On Wed, 06/15 14:40, Colin Lord wrote:
> >> From: Marc Mari <address@hidden>
> >>
> >> To simplify the addition of new block modules, add a script that generates
> >> include/qemu/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 <clord@redhat.com>
> >> ---
> >>  .gitignore                      |   1 +
> >>  Makefile                        |   8 +++
> >>  scripts/modules/module_block.py | 134 ++++++++++++++++++++++++++++++++++++++++
> >>  3 files changed, 143 insertions(+)
> >>  create mode 100644 scripts/modules/module_block.py
> >>
> >> diff --git a/.gitignore b/.gitignore
> >> index 38ee1c5..06aa064 100644
> >> --- a/.gitignore
> >> +++ b/.gitignore
> >> @@ -110,3 +110,4 @@ tags
> >>  TAGS
> >>  docker-src.*
> >>  *~
> >> +/include/qemu/module_block.h
> >> diff --git a/Makefile b/Makefile
> >> index ed4032a..8f8b6a2 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 += include/qemu/module_block.h
> >> +
> >>  # Don't try to regenerate Makefile or configure
> >>  # We don't generate any of them
> >>  Makefile: ;
> >> @@ -352,6 +354,12 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) libqemuutil.a libqemustub.a
> >>  ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a
> >>  	$(call LINK, $^)
> >>  
> >> +include/qemu/module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
> >> +	$(call quiet-command,$(PYTHON) \
> >> +$(SRC_PATH)/scripts/modules/module_block.py \
> >> +	$(SRC_PATH)/"./include/qemu/" $(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..005bc49
> >> --- /dev/null
> >> +++ b/scripts/modules/module_block.py
> >> @@ -0,0 +1,134 @@
> >> +#!/usr/bin/python
> >> +#
> >> +# Module information generator
> >> +#
> >> +# Copyright Red Hat, Inc. 2015
> >> +#
> >> +# Authors:
> >> +#  Marc Mari <address@hidden>
> > 
> > Address hidden seems like a mistake during copy from web. :)
> > 
> > One more below..
> > 
> 
> Yep, I didn't have the original emails (only the web archives) and I
> didn't realize it wasn't supposed to look like that until I sent it out.
> I'll fix it for the next version.

Mailing list archives are available here in mbox format:

ftp://lists.gnu.org/qemu-devel/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]