* [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION
@ 2012-05-14 22:04 Michael Roth
2012-05-15 8:08 ` Michal Privoznik
2012-05-15 13:05 ` Luiz Capitulino
0 siblings, 2 replies; 3+ messages in thread
From: Michael Roth @ 2012-05-14 22:04 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, lcapitulino
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 <mdroth@linux.vnet.ibm.com>
---
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 <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);
}
@@ -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;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION
2012-05-14 22:04 [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION Michael Roth
@ 2012-05-15 8:08 ` Michal Privoznik
2012-05-15 13:05 ` Luiz Capitulino
1 sibling, 0 replies; 3+ messages in thread
From: Michal Privoznik @ 2012-05-15 8:08 UTC (permalink / raw)
To: Michael Roth; +Cc: aliguori, qemu-devel, lcapitulino
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 <mdroth@linux.vnet.ibm.com>
> ---
> 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 <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);
> }
>
> @@ -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 <mprivozn@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION
2012-05-14 22:04 [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION Michael Roth
2012-05-15 8:08 ` Michal Privoznik
@ 2012-05-15 13:05 ` Luiz Capitulino
1 sibling, 0 replies; 3+ messages in thread
From: Luiz Capitulino @ 2012-05-15 13:05 UTC (permalink / raw)
To: Michael Roth; +Cc: aliguori, qemu-devel
On Mon, 14 May 2012 17:04:41 -0500
Michael Roth <mdroth@linux.vnet.ibm.com> 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 <mdroth@linux.vnet.ibm.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
> 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 <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);
> }
>
> @@ -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;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-15 13:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 22:04 [Qemu-devel] [PATCH 1.1] qemu-ga: align versioning with QEMU_VERSION Michael Roth
2012-05-15 8:08 ` Michal Privoznik
2012-05-15 13:05 ` Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).