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 5dcc5f5..685472e 100644
--- a/client.c
+++ b/client.c
@@ -966,9 +966,9 @@
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
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 8675f61..78a5c36 100644
--- a/gclient.c
+++ b/gclient.c
@@ -525,7 +525,6 @@
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 @@
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 7422628..4f42a5c 100644
--- 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 d3d683e..18091be 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
<Product Id="*"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="FIO"
- UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_MAJOR).$(env.FIO_MINOR).$(env.FIO_PATCH)">
+ UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_VERSION)">
<Package
Comments="Contact: Your local administrator"
Description="Flexible IO Tester"
diff --git a/server.c b/server.c
index 2bf74b2..f1c69dd 100644
--- 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 @@
#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 3c70421..59a4101 100644
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@
};
enum {
- FIO_SERVER_VER = 15,
+ FIO_SERVER_VER = 16,
FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
@@ -86,9 +86,7 @@
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;