From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJ4a-0001hT-39 for qemu-devel@nongnu.org; Tue, 15 May 2012 10:50:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUJ4T-00038h-ND for qemu-devel@nongnu.org; Tue, 15 May 2012 10:49:59 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:42428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJ4T-00036X-Fy for qemu-devel@nongnu.org; Tue, 15 May 2012 10:49:53 -0400 Received: by yhoo21 with SMTP id o21so6958266yho.4 for ; Tue, 15 May 2012 07:49:51 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Tue, 15 May 2012 09:48:59 -0500 Message-Id: <1337093339-10786-14-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1337093339-10786-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1337093339-10786-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 13/13] qemu-ga: align versioning with QEMU_VERSION List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mprivozn@redhat.com, aliguori@us.ibm.com, eblake@redhat.com, jcody@redhat.com, lcapitulino@redhat.com 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 Acked-by: Luiz Capitulino Signed-off-by: Michael Roth --- qemu-ga.c | 4 ++-- qga/commands.c | 2 +- qga/guest-agent-core.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/qemu-ga.c b/qemu-ga.c index 42e271f..8199da7 100644 --- a/qemu-ga.c +++ b/qemu-ga.c @@ -169,7 +169,7 @@ static void usage(const char *cmd) " -h, --help display this help and exit\n" "\n" "Report bugs to \n" - , cmd, QGA_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_PIDFILE_DEFAULT, + , cmd, QEMU_VERSION, QGA_VIRTIO_PATH_DEFAULT, QGA_PIDFILE_DEFAULT, QGA_STATEDIR_DEFAULT); } @@ -729,7 +729,7 @@ int main(int argc, char **argv) log_level = G_LOG_LEVEL_MASK; break; case 'V': - printf("QEMU Guest Agent %s\n", QGA_VERSION); + printf("QEMU Guest Agent %s\n", QEMU_VERSION); return 0; case 'd': daemonize = 1; diff --git a/qga/commands.c b/qga/commands.c index 5bcceaa..46b0b08 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -52,7 +52,7 @@ struct GuestAgentInfo *qmp_guest_info(Error **err) GuestAgentCommandInfoList *cmd_info_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(); if (*cmd_list_head == NULL) { diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 6dba104..49a7abe 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -13,7 +13,6 @@ #include "qapi/qmp-core.h" #include "qemu-common.h" -#define QGA_VERSION "1.0" #define QGA_READ_COUNT_DEFAULT 4096 typedef struct GAState GAState; -- 1.7.4.1