[Qemu-devel] [PULL 0/1] qemu-ga patch queue for 2.6

[Qemu-devel] [PULL 0/1] qemu-ga patch queue for 2.6

[Michael Roth]

The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000)

are available in the git repository at:


  git://github.com/mdroth/qemu.git tags/qga-pull-2016-03-21-tag

for you to fetch changes up to a284974dee57b5ff7a194cf5daa4026bd22bf5ad:

  qemu-ga: drop unused local err variable (2016-03-20 19:51:18 -0500)

----------------------------------------------------------------
qemu-ga patch queue for 2.6

* remove unused variable

----------------------------------------------------------------
Stefan Hajnoczi (1):
      qemu-ga: drop unused local err variable

 qga/main.c | 6 ------
 1 file changed, 6 deletions(-)

[Qemu-devel] [PULL 1/1] qemu-ga: drop unused local err variable

[Michael Roth]

From: Stefan Hajnoczi <stefanha@redhat.com>

Commit 125b310e1d62e3a1dc1e7758563e598957ca7ae4 ("qemu-ga: move
channel/transport functionality into wrapper class") stopped using the
local err variable in channel_event_cb().

This patch deletes the unused variable.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/qga/main.c b/qga/main.c
index 0a168e2..743c5c1 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -618,13 +618,7 @@ static gboolean channel_event_cb(GIOCondition condition, gpointer data)
     GAState *s = data;
     gchar buf[QGA_READ_COUNT_DEFAULT+1];
     gsize count;
-    GError *err = NULL;
     GIOStatus status = ga_channel_read(s->channel, buf, QGA_READ_COUNT_DEFAULT, &count);
-    if (err != NULL) {
-        g_warning("error reading channel: %s", err->message);
-        g_error_free(err);
-        return false;
-    }
     switch (status) {
     case G_IO_STATUS_ERROR:
         g_warning("error reading channel");
-- 
1.9.1

Re: [Qemu-devel] [PULL 0/1] qemu-ga patch queue for 2.6

[Peter Maydell]

On 21 March 2016 at 17:37, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/mdroth/qemu.git tags/qga-pull-2016-03-21-tag
>
> for you to fetch changes up to a284974dee57b5ff7a194cf5daa4026bd22bf5ad:
>
>   qemu-ga: drop unused local err variable (2016-03-20 19:51:18 -0500)
>
> ----------------------------------------------------------------
> qemu-ga patch queue for 2.6
>
> * remove unused variable

Applied, thanks.

-- PMM