diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-22 17:39:48 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-22 17:39:48 +0000 |
| commit | 459621ac1a505ef7dee769295ee2e6c835b2314d (patch) | |
| tree | 9d1d5f16f8d14ed2eb348fab1baecec0330f5c73 | |
| parent | ac0d25e843bdad441db2a26f78898f533bf91bb5 (diff) | |
| parent | a284974dee57b5ff7a194cf5daa4026bd22bf5ad (diff) | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging
qemu-ga patch queue for 2.6
* remove unused variable
# gpg: Signature made Mon 21 Mar 2016 17:32:42 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
* remotes/mdroth/tags/qga-pull-2016-03-21-tag:
qemu-ga: drop unused local err variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qga/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qga/main.c b/qga/main.c index 0a168e2da8..743c5c1349 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"); |