From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUCo6-000707-Pb for qemu-devel@nongnu.org; Tue, 15 May 2012 04:08:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUCnz-0005Wk-RZ for qemu-devel@nongnu.org; Tue, 15 May 2012 04:08:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUCnz-0005WV-J7 for qemu-devel@nongnu.org; Tue, 15 May 2012 04:08:27 -0400 Message-ID: <4FB20EF6.6020404@redhat.com> Date: Tue, 15 May 2012 10:08:22 +0200 From: Michal Privoznik MIME-Version: 1.0 References: <1337033081-31772-1-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1337033081-31772-1-git-send-email-mdroth@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, lcapitulino@redhat.com On 15.05.2012 00:04, Michael Roth wrote: > 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. > > 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 e2725c8..3e49f7e 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); > } > > @@ -730,7 +730,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; Reviewed-by: Michal Privoznik