Get rid of fio_version.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:

	fio_version.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/client.c b/client.c
index 5dcc5f5410bf712e1947b1e66391eaab7335a545..685472e20c7c6c8156441b5ab2a44e07e5ae63f8 100644 (file)
--- a/client.c
+++ b/client.c
@@ -966,9 +966,9 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
 
        sprintf(bit, "%d-bit", probe->bpp * 8);
 
-       log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n",
+       log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n",
                probe->hostname, probe->bigendian, bit, os, arch,
-               probe->fio_major, probe->fio_minor, probe->fio_patch);
+               probe->fio_version);
 
        if (!client->name)
                client->name = strdup((char *) probe->hostname);

diff --git a/fio_version.h b/fio_version.h
deleted file mode 100644 (file)
index 42c0ff7..0000000
--- a/fio_version.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FIO_VERSION_H
-#define FIO_VERSION_H
-
-#define FIO_MAJOR      2
-#define FIO_MINOR      0
-#define FIO_PATCH      6
-
-#endif

diff --git a/gclient.c b/gclient.c
index 8675f617fb2d4dfd46d4326c16c5f88e8baf56bd..78a5c361ea00c544e4caf88610c5766bc2b53be9 100644 (file)
--- a/gclient.c
+++ b/gclient.c
@@ -525,7 +525,6 @@ static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
        struct gfio_client *gc = client->client_data;
        struct gui_entry *ge = gc->ge;
        const char *os, *arch;
-       char buf[64];
 
        os = fio_get_os_string(probe->os);
        if (!os)
@@ -546,8 +545,7 @@ static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
        gtk_label_set_text(GTK_LABEL(ge->probe.hostname), (char *) probe->hostname);
        gtk_label_set_text(GTK_LABEL(ge->probe.os), os);
        gtk_label_set_text(GTK_LABEL(ge->probe.arch), arch);
-       sprintf(buf, "%u.%u.%u", probe->fio_major, probe->fio_minor, probe->fio_patch);
-       gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), buf);
+       gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), (char *) probe->fio_version);
 
        gfio_set_state(ge, GE_STATE_CONNECTED);
 

diff --git a/init.c b/init.c
index 742262867a3d51ecd529b033264789ee00c947d0..4f42a5cccf066eb441e6ca830d4400169fc3ad8a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -23,8 +23,6 @@
 
 #include "lib/getopt.h"
 
-#include "fio_version.h"
-
 const char fio_version_string[] = FIO_VERSION;
 
 #define FIO_RANDSEED           (0xb1899bedUL)

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index d3d683e72a9365a078862e865d932fa265458aec..18091bee9d6c215f76bfecd4d0c55a39dd613392 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
        <Product Id="*"\r
          Codepage="1252" Language="1033"\r
          Manufacturer="fio" Name="FIO"\r
-         UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_MAJOR).$(env.FIO_MINOR).$(env.FIO_PATCH)">\r
+         UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_VERSION)">\r
                <Package \r
                  Comments="Contact: Your local administrator"\r
                  Description="Flexible IO Tester"\r

diff --git a/server.c b/server.c
index 2bf74b255965c03ec7bf4074ea5d8e10ba4e46c7..f1c69dd37a92b59b164bad40acce9d6cb8a42a9c 100644 (file)
--- a/server.c
+++ b/server.c
@@ -23,8 +23,6 @@
 #include "crc/crc16.h"
 #include "lib/ieee754.h"
 
-#include "fio_version.h"
-
 int fio_net_port = FIO_NET_PORT;
 
 int exit_backend = 0;
@@ -624,9 +622,7 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd)
 #ifdef FIO_BIG_ENDIAN
        probe.bigendian = 1;
 #endif
-       probe.fio_major = FIO_MAJOR;
-       probe.fio_minor = FIO_MINOR;
-       probe.fio_patch = FIO_PATCH;
+       strcpy((char *) probe.fio_version, fio_version_string);
 
        probe.os        = FIO_OS;
        probe.arch      = FIO_ARCH;

diff --git a/server.h b/server.h
index 3c704213a82fe35c88780e13f32f8ca6bc59890c..59a41018ab26dec3420e69c364425917ec35297c 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 15,
+       FIO_SERVER_VER                  = 16,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
 
@@ -86,9 +86,7 @@ struct cmd_du_pdu {
 struct cmd_probe_pdu {
        uint8_t hostname[64];
        uint8_t bigendian;
-       uint8_t fio_major;
-       uint8_t fio_minor;
-       uint8_t fio_patch;
+       uint8_t fio_version[8];
        uint8_t os;
        uint8_t arch;
        uint8_t bpp;