mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
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>
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user