ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge qio-next 2016-08-03 v1 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJXob3YAAoJEL6G67QVEE/fXlMP/RVxOwA1HNO+GddD457ZWAkS
 1cF457EL1ItptZLJtBDojfuVxfHZCEeO1ozmNWbDwKxZUWfP+BWO1PA4aCN1cW7U
 sYUuTVPTpESmDArtotZ0MXlLR27oSQwBhH6Npy25lWppgFDYp6lntoiHIcz7PV+D
 mdsf51AP6gFgEuCRDlJQiQt8XZPrNmFzbDZZZqQxZSovHYPJM7paLmWfLPdWu8yO
 QlBkS84U7d5uZQtTEiCfbGtrExZmH4kak75yTunWpDixj8O9XEjKTS1D82YTiKx6
 iFL5ETI62DWrDFTZ1HVnUwp0fO+pdVPqUVKCQOUY70YFBMJPa4xJQpHVpc+HE6Y8
 LQhVzs6o43hkabaQlWnjIK8DUBFBD+S9cmOTJhA2X/bzEQ+ebZcYjo6s6/vfeKmk
 tr2SkmBiKkfaFLYAf4bJzevvfVGuaP3DOlxkNH31A9R9TNm7BB/Gz28ZvXGqC2ey
 F5VVXVdT4woD0YALXN1SC8qow9ui4zgtWNQLuF0jvu1ee/ocpMcvT0V5rtnzE+4k
 Q/z7OwIKq64khpPmip17/M5C11rNmnnHBSWXt27IaD2i+IqA4dCWSf475uwsmu6n
 u8dLmWOJ1N//w3gjkmVIg65PrbUAdQiCGdTNk6bvx2t27jxRbSPf04pfvGakkUde
 +XTb5OsWxnEQEzRBgUE9
 =Lb5Y
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-next-2016-08-03-v1' into staging

Merge qio-next 2016-08-03 v1

# gpg: Signature made Wed 03 Aug 2016 10:48:08 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-next-2016-08-03-v1:
  io: remove mistaken call to object_ref on QTask

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-08-03 13:43:28 +01:00
parent 90f54472f4 bc35d51077
commit 0cb34ff32e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
io/channel-websock.c
View File

@ -317,14 +317,13 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc,
return TRUE;
}
object_ref(OBJECT(task));
trace_qio_channel_websock_handshake_reply(ioc);
qio_channel_add_watch(
wioc->master,
G_IO_OUT,
qio_channel_websock_handshake_send,
task,
(GDestroyNotify)object_unref);
NULL);
return FALSE;
}