mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-ga: align versioning with QEMU_VERSION

Browse Source 
Previously qemu-ga version was defined seperately. Since it is aligned
with QEMU releases, use QEMU_VERSION instead. This also implies the
version bump for 1.1[-rcN] release of qemu-ga.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Michael Roth 2012-05-14 09:33:48 -05:00
parent 6c615ec57e
commit 8efacc43ae
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu-ga.c
View File

@ -169,7 +169,7 @@ static void usage(const char *cmd)
" -h, --help display this help and exit\n" " -h, --help display this help and exit\n"
"\n" "\n"
"Report bugs to <mdroth@linux.vnet.ibm.com>\n" "Report bugs to <mdroth@linux.vnet.ibm.com>\n"
, cmd, QGA_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_PIDFILE_DEFAULT, , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_PIDFILE_DEFAULT,
QGA_STATEDIR_DEFAULT); QGA_STATEDIR_DEFAULT);
} }
@ -729,7 +729,7 @@ int main(int argc, char **argv)
log_level = G_LOG_LEVEL_MASK; log_level = G_LOG_LEVEL_MASK;
break; break;
case 'V': case 'V':
printf("QEMU Guest Agent %s\n", QGA_VERSION); printf("QEMU Guest Agent %s\n", QEMU_VERSION);
return 0; return 0;
case 'd': case 'd':
daemonize = 1; daemonize = 1;

2
qga/commands.c
View File

@ -52,7 +52,7 @@ struct GuestAgentInfo *qmp_guest_info(Error **err)
GuestAgentCommandInfoList *cmd_info_list; GuestAgentCommandInfoList *cmd_info_list;
char **cmd_list_head, **cmd_list; char **cmd_list_head, **cmd_list;
info->version = g_strdup(QGA_VERSION); info->version = g_strdup(QEMU_VERSION);
cmd_list_head = cmd_list = qmp_get_command_list(); cmd_list_head = cmd_list = qmp_get_command_list();
if (*cmd_list_head == NULL) { if (*cmd_list_head == NULL) {

1
qga/guest-agent-core.h
View File

@ -13,7 +13,6 @@
#include "qapi/qmp-core.h" #include "qapi/qmp-core.h"
#include "qemu-common.h" #include "qemu-common.h"
#define QGA_VERSION "1.0"
#define QGA_READ_COUNT_DEFAULT 4096 #define QGA_READ_COUNT_DEFAULT 4096
typedef struct GAState GAState; typedef struct GAState GAState;