Get rid of fio_version.h

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

diff --git a/client.c b/client.c
index ee6765ed7adf9671c5cc131909e80ebe2e5abdff..0ce7a6ebf3692166f381afb12ff632e1bc16244c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -816,9 +816,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 34b5784..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      7
-
-#endif

diff --git a/init.c b/init.c
index 1eea800c43825b41a42f2193248a5dfc80042f8e..3865d099c94c569771571323920b4598c7a79fcf 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 33f69ef611a7ae2dd7eda4bd7e0e15c3284487a6..1487d80a46945c329b595c5f36d3b2221e8b7179 100644 (file)
--- a/server.c
+++ b/server.c
@@ -22,8 +22,6 @@
 #include "crc/crc16.h"
 #include "lib/ieee754.h"
 
-#include "fio_version.h"
-
 int fio_net_port = 8765;
 
 int exit_backend = 0;
@@ -407,9 +405,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 27da94f23c69e00ed089af87de833b84a612f9f2..d62eeb01ed51a582d940bcf9f570e3fafd2ac1cc 100644 (file)
--- a/server.h
+++ b/server.h
@@ -36,7 +36,7 @@ struct fio_net_int_cmd {
 };
 
 enum {
-       FIO_SERVER_VER          = 6,
+       FIO_SERVER_VER          = 7,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -78,9 +78,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;