Commit 3688d8c7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

build-sys: define QEMU_VERSION_{MAJOR, MINOR, MICRO} 



There are better chances to find what went wrong at build time than a
later assert in qmp_query_version

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20160912091913.15831-2-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent e3571ae3

qmp.c

+3 −13
Original line number Diff line number Diff line
@@ -51,21 +51,11 @@ NameInfo *qmp_query_name(Error **errp) 
VersionInfo *qmp_query_version(Error **errp)

{

    VersionInfo *info = g_new0(VersionInfo, 1);

    const char *version = QEMU_VERSION;

    const char *tmp;

    int err;



    info->qemu = g_new0(VersionTriple, 1);

    err = qemu_strtoll(version, &tmp, 10, &info->qemu->major);

    assert(err == 0);

    tmp++;



    err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->minor);

    assert(err == 0);

    tmp++;



    err = qemu_strtoll(tmp, &tmp, 10, &info->qemu->micro);

    assert(err == 0);

    info->qemu->major = QEMU_VERSION_MAJOR;

    info->qemu->minor = QEMU_VERSION_MINOR;

    info->qemu->micro = QEMU_VERSION_MICRO;

    info->package = g_strdup(QEMU_PKGVERSION);



    return info;

scripts/create_config

+6 −0
Original line number Diff line number Diff line
@@ -7,7 +7,13 @@ while read line; do 
case $line in

 VERSION=*) # configuration

    version=${line#*=}

    major=$(echo "$version" | cut -d. -f1)

    minor=$(echo "$version" | cut -d. -f2)

    micro=$(echo "$version" | cut -d. -f3)

    echo "#define QEMU_VERSION \"$version\""

    echo "#define QEMU_VERSION_MAJOR $major"

    echo "#define QEMU_VERSION_MINOR $minor"

    echo "#define QEMU_VERSION_MICRO $micro"

    ;;

 qemu_*dir=*) # qemu-specific directory configuration

    name=${line%=*}