Re: [Qemu-devel] [PATCH 04/14] create_config: separate section for qemu_*dir variables (v2)

Re: [Qemu-devel] [PATCH 04/14] create_config: separate section for qemu_*dir variables (v2)

[Eric Blake]

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

On 04/18/2012 01:55 PM, Eduardo Habkost wrote:
> The generic *dir section will eventually go away and be replaced with
> qemu_* section. By now, both sections will be kept, while the variables
> get renamed on config-host.mak.
> 
> With this patch, a XXXdir variable will become a CONFIG_QEMU_XXXDIR
> define, and a qemu_XXXdir variable will become CONFIG_QEMU_XXXDIR as
> well (instead of becoming a CONFIG_QEMU_QEMU_XXXDIR define).
> 
> Changes v1 -> v2:
>  - Rebase on top of newer qemu.git changes, that changed
>    "tr '[:lower:]' '[:upper:]'" to "LC_ALL=C tr '[a-z]' '[A-Z]'".
> 

> + qemu_*dir=*) # qemu-specific directory configuration
> +    name=${line%=*}

Bug.  You want ${line%%=*}, in case the value portion of this assignment
contains a second '=' character.

-- 
Eric Blake   eblake@redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 617 bytes --]

Re: [Qemu-devel] [PATCH 04/14] create_config: separate section for qemu_*dir variables (v2)

[Eduardo Habkost]

On Tue, Oct 09, 2012 at 09:02:56AM -0600, Eric Blake wrote:
> On 04/18/2012 01:55 PM, Eduardo Habkost wrote:
> > The generic *dir section will eventually go away and be replaced with
> > qemu_* section. By now, both sections will be kept, while the variables
> > get renamed on config-host.mak.
> > 
> > With this patch, a XXXdir variable will become a CONFIG_QEMU_XXXDIR
> > define, and a qemu_XXXdir variable will become CONFIG_QEMU_XXXDIR as
> > well (instead of becoming a CONFIG_QEMU_QEMU_XXXDIR define).
> > 
> > Changes v1 -> v2:
> >  - Rebase on top of newer qemu.git changes, that changed
> >    "tr '[:lower:]' '[:upper:]'" to "LC_ALL=C tr '[a-z]' '[A-Z]'".
> > 
> 
> > + qemu_*dir=*) # qemu-specific directory configuration
> > +    name=${line%=*}
> 
> Bug.  You want ${line%%=*}, in case the value portion of this assignment
> contains a second '=' character.

The new code was simply copying the behavior of the existing "*dir=*)"
case (so no behavior would change while renaming the qemu_*dir
variables).

But I really didn't notice the bug when copying the code. Thanks for
spotting it!

-- 
Eduardo

[Qemu-devel] [PATCH v4 00/14] configure: --with-confsuffix option

[Eduardo Habkost]

I was going to resend only patch 14/14 with a fixed description, but then I
noticed the series had to be rebased, with small conflicts on patches 04/14
and 12/14, so I am submitting the whole series again.

Changes v3 -> v4:
 - Rebase against latest qemu.git
 - Changed patch 14/14 subject to match the code (--with-confsuffix instead of --confsuffix)

Changes v2 -> v3:
 - Changes --datadir meaning to match Autoconf convention
   (meaning that it should point to /usr/share, not /usr/share/qemu).
   NOTE: this breaks compatibility.
   I don't know of anybody who uses that option today. Neither Fedora, Debian,
   Arch Linux, Gentoo, or FreeBSD use it[1].
 - Add --with-confsuffix option, to allow the /etc/qemu and /usr/share/qemu
   directories to have a different names.

[1] http://article.gmane.org/gmane.comp.emulators.qemu/142924


Series description:

Most of the patches are variable renames and cleanups. The actual changes are
only on the last 2 patches.

First, internal configure variables are renamed, without changing
config-host.mak:

  configure: rename $datadir to $qemu_datadir
  configure: rename $docdir to $qemu_docdir
  configure: rename $confdir to $qemu_confdir

Then create_config gets ready for config-host.mak variable renames
(Qemu-specific directories will now have a "qemu_" prefix):

  create_config: separate section for qemu_*dir variables (v2)

Then, variables are renamed on config-host.mak and Makefiles:

  config-host.mak: rename datadir to qemu_datadir
  config-host.mak: rename confdir to qemu_confdir
  Makefile: use $(qemu_confdir) instead of $(sysconfdir)/qemu
  config-host.mak: rename docdir to qemu_docdir
  config-host.mak: remove CONFIG_QEMU_SHAREDIR
  config-host.mak: reorder variables a bit

Then old code on create_config is removed:

  create_config: remove *dir block
  create_config: simplify prefix=* block, remove CONFIG_QEMU_PREFIX

Finally, the user-visible changes:

  configure: change meaning of --datadir to Autoconf convention
  configure: add --with-confsuffix option


Eduardo Habkost (14):
  configure: rename $datadir to $qemu_datadir
  configure: rename $docdir to $qemu_docdir
  configure: rename $confdir to $qemu_confdir
  create_config: separate section for qemu_*dir variables (v2)
  config-host.mak: rename datadir to qemu_datadir
  config-host.mak: rename confdir to qemu_confdir
  Makefile: use $(qemu_confdir) instead of $(sysconfdir)/qemu
  config-host.mak: rename docdir to qemu_docdir
  config-host.mak: remove CONFIG_QEMU_SHAREDIR
  config-host.mak: reorder variables a bit
  create_config: remove *dir block
  create_config: simplify prefix=* block, remove CONFIG_QEMU_PREFIX
  configure: change meaning of --datadir to Autoconf convention
  configure: add --with-confsuffix option

 Makefile              |   16 ++++++++--------
 Makefile.target       |    4 ++--
 configure             |   29 ++++++++++++++++-------------
 scripts/create_config |    8 ++++++--
 4 files changed, 32 insertions(+), 25 deletions(-)

-- 
1.7.3.2

[Qemu-devel] [PATCH 04/14] create_config: separate section for qemu_*dir variables (v2)

[Eduardo Habkost]

The generic *dir section will eventually go away and be replaced with
qemu_* section. By now, both sections will be kept, while the variables
get renamed on config-host.mak.

With this patch, a XXXdir variable will become a CONFIG_QEMU_XXXDIR
define, and a qemu_XXXdir variable will become CONFIG_QEMU_XXXDIR as
well (instead of becoming a CONFIG_QEMU_QEMU_XXXDIR define).

Changes v1 -> v2:
 - Rebase on top of newer qemu.git changes, that changed
   "tr '[:lower:]' '[:upper:]'" to "LC_ALL=C tr '[a-z]' '[A-Z]'".

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 scripts/create_config |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/scripts/create_config b/scripts/create_config
index 470e05e..f9ba2f5 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -13,6 +13,15 @@ case $line in
     pkgversion=${line#*=}
     echo "#define QEMU_PKGVERSION \"$pkgversion\""
     ;;
+ qemu_*dir=*) # qemu-specific directory configuration
+    name=${line%=*}
+    value=${line#*=}
+    define_name=`echo $name | LC_ALL=C tr '[a-z]' '[A-Z]'`
+    eval "define_value=\"$value\""
+    echo "#define CONFIG_$define_name \"$define_value\""
+    # save for the next definitions
+    eval "$name=\$define_value"
+    ;;
  prefix=* | [a-z]*dir=*) # directory configuration
     name=${line%=*}
     value=${line#*=}
-- 
1.7.3.2