From: Sander Eikelenboom Subject: [Patch] fix Passthrough of Serial port to tty for qemu-dm (from qemu-upstream) Date: Thu, 9 Apr 2009 15:32:37 +0200 Message-ID: <148132180.20090409153237@eikelenboom.it> References: <123905713.20090407181620@eikelenboom.it> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------976D1DD2B84FC0" Return-path: In-Reply-To: <123905713.20090407181620@eikelenboom.it> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org ------------976D1DD2B84FC0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable =0D=0AIn upstream qemu my issue was fixed, see http://git.kernel.dk/?p=3Dqe= mu.git;a=3Dcommit;h=3Db4abdfa4fbf4afaa7540ddaf814236e7844935ff also send a patch with this post. Passthrough of the hardware serial port to qemu works like a charm with my = serial touchscreen to a xen HVM with linux or windows. Is it already possible to use upstream qemu instead of qemu-dm with xen, or= is it still depending on modifications in it's own qemu-dm ? -- Sander Eikelenboom --- qemu-char.c 2009-04-09 15:00:09.000000000 +0200 +++ qemu-char.c 2009-04-09 15:09:14.000000000 +0200 @@ -1055,37 +1055,48 @@ static int tty_serial_ioctl(CharDriverSt } break; case CHR_IOCTL_SERIAL_GET_TIOCM: { int sarg =3D 0; int *targ =3D (int *)arg; ioctl(s->fd_in, TIOCMGET, &sarg); *targ =3D 0; - if (sarg | TIOCM_CTS) + if (sarg & TIOCM_CTS) *targ |=3D CHR_TIOCM_CTS; - if (sarg | TIOCM_CAR) + if (sarg & TIOCM_CAR) *targ |=3D CHR_TIOCM_CAR; - if (sarg | TIOCM_DSR) + if (sarg & TIOCM_DSR) *targ |=3D CHR_TIOCM_DSR; - if (sarg | TIOCM_RI) + if (sarg & TIOCM_RI) *targ |=3D CHR_TIOCM_RI; - if (sarg | TIOCM_DTR) + if (sarg & TIOCM_DTR) *targ |=3D CHR_TIOCM_DTR; - if (sarg | TIOCM_RTS) + if (sarg & TIOCM_RTS) *targ |=3D CHR_TIOCM_RTS; } break; case CHR_IOCTL_SERIAL_SET_TIOCM: { int sarg =3D *(int *)arg; int targ =3D 0; - if (sarg | CHR_TIOCM_DTR) + ioctl(s->fd_in, TIOCMGET, &targ); + targ &=3D ~(CHR_TIOCM_CTS | CHR_TIOCM_CAR | CHR_TIOCM_DSR + | CHR_TIOCM_RI | CHR_TIOCM_DTR | CHR_TIOCM_RTS); + if (sarg & CHR_TIOCM_CTS) + targ |=3D TIOCM_CTS; + if (sarg & CHR_TIOCM_CAR) + targ |=3D TIOCM_CAR; + if (sarg & CHR_TIOCM_DSR) + targ |=3D TIOCM_DSR; + if (sarg & CHR_TIOCM_RI) + targ |=3D TIOCM_RI; + if (sarg & CHR_TIOCM_DTR) targ |=3D TIOCM_DTR; - if (sarg | CHR_TIOCM_RTS) + if (sarg & CHR_TIOCM_RTS) targ |=3D TIOCM_RTS; ioctl(s->fd_in, TIOCMSET, &targ); } break; default: return -ENOTSUP; } return 0; ------------976D1DD2B84FC0 Content-Type: application/octet-stream; name="patch-qemu-dm-serial-passthrough-ttyS0.diff" Content-transfer-encoding: base64 Content-Disposition: attachment; filename="patch-qemu-dm-serial-passthrough-ttyS0.diff" LS0tIHFlbXUtY2hhci5jCTIwMDktMDQtMDkgMTU6MDA6MDkuMDAwMDAwMDAwICswMjAwDQor KysgcWVtdS1jaGFyLmMJMjAwOS0wNC0wOSAxNTowOToxNC4wMDAwMDAwMDAgKzAyMDANCkBA IC0xMDU1LDM3ICsxMDU1LDQ4IEBAIHN0YXRpYyBpbnQgdHR5X3NlcmlhbF9pb2N0bChDaGFy RHJpdmVyU3QNCiAgICAgICAgIH0NCiAgICAgICAgIGJyZWFrOw0KICAgICBjYXNlIENIUl9J T0NUTF9TRVJJQUxfR0VUX1RJT0NNOg0KICAgICAgICAgew0KICAgICAgICAgICAgIGludCBz YXJnID0gMDsNCiAgICAgICAgICAgICBpbnQgKnRhcmcgPSAoaW50ICopYXJnOw0KICAgICAg ICAgICAgIGlvY3RsKHMtPmZkX2luLCBUSU9DTUdFVCwgJnNhcmcpOw0KICAgICAgICAgICAg ICp0YXJnID0gMDsNCi0gICAgICAgICAgICBpZiAoc2FyZyB8IFRJT0NNX0NUUykNCisgICAg ICAgICAgICBpZiAoc2FyZyAmIFRJT0NNX0NUUykNCiAgICAgICAgICAgICAgICAgKnRhcmcg fD0gQ0hSX1RJT0NNX0NUUzsNCi0gICAgICAgICAgICBpZiAoc2FyZyB8IFRJT0NNX0NBUikN CisgICAgICAgICAgICBpZiAoc2FyZyAmIFRJT0NNX0NBUikNCiAgICAgICAgICAgICAgICAg KnRhcmcgfD0gQ0hSX1RJT0NNX0NBUjsNCi0gICAgICAgICAgICBpZiAoc2FyZyB8IFRJT0NN X0RTUikNCisgICAgICAgICAgICBpZiAoc2FyZyAmIFRJT0NNX0RTUikNCiAgICAgICAgICAg ICAgICAgKnRhcmcgfD0gQ0hSX1RJT0NNX0RTUjsNCi0gICAgICAgICAgICBpZiAoc2FyZyB8 IFRJT0NNX1JJKQ0KKyAgICAgICAgICAgIGlmIChzYXJnICYgVElPQ01fUkkpDQogICAgICAg ICAgICAgICAgICp0YXJnIHw9IENIUl9USU9DTV9SSTsNCi0gICAgICAgICAgICBpZiAoc2Fy ZyB8IFRJT0NNX0RUUikNCisgICAgICAgICAgICBpZiAoc2FyZyAmIFRJT0NNX0RUUikNCiAg ICAgICAgICAgICAgICAgKnRhcmcgfD0gQ0hSX1RJT0NNX0RUUjsNCi0gICAgICAgICAgICBp ZiAoc2FyZyB8IFRJT0NNX1JUUykNCisgICAgICAgICAgICBpZiAoc2FyZyAmIFRJT0NNX1JU UykNCiAgICAgICAgICAgICAgICAgKnRhcmcgfD0gQ0hSX1RJT0NNX1JUUzsNCiAgICAgICAg IH0NCiAgICAgICAgIGJyZWFrOw0KICAgICBjYXNlIENIUl9JT0NUTF9TRVJJQUxfU0VUX1RJ T0NNOg0KICAgICAgICAgew0KICAgICAgICAgICAgIGludCBzYXJnID0gKihpbnQgKilhcmc7 DQogICAgICAgICAgICAgaW50IHRhcmcgPSAwOw0KLSAgICAgICAgICAgIGlmIChzYXJnIHwg Q0hSX1RJT0NNX0RUUikNCisgICAgICAgICAgICBpb2N0bChzLT5mZF9pbiwgVElPQ01HRVQs ICZ0YXJnKTsNCisgICAgICAgICAgICB0YXJnICY9IH4oQ0hSX1RJT0NNX0NUUyB8IENIUl9U SU9DTV9DQVIgfCBDSFJfVElPQ01fRFNSDQorCSAgICAgICAgICAgICB8IENIUl9USU9DTV9S SSB8IENIUl9USU9DTV9EVFIgfCBDSFJfVElPQ01fUlRTKTsNCisgICAgICAgICAgICBpZiAo c2FyZyAmIENIUl9USU9DTV9DVFMpDQorICAgICAgICAgICAgICAgIHRhcmcgfD0gVElPQ01f Q1RTOw0KKyAgICAgICAgICAgIGlmIChzYXJnICYgQ0hSX1RJT0NNX0NBUikNCisgICAgICAg ICAgICAgICAgdGFyZyB8PSBUSU9DTV9DQVI7DQorICAgICAgICAgICAgaWYgKHNhcmcgJiBD SFJfVElPQ01fRFNSKQ0KKyAgICAgICAgICAgICAgICB0YXJnIHw9IFRJT0NNX0RTUjsNCisg ICAgICAgICAgICBpZiAoc2FyZyAmIENIUl9USU9DTV9SSSkNCisgICAgICAgICAgICAgICAg dGFyZyB8PSBUSU9DTV9SSTsNCisgICAgICAgICAgICBpZiAoc2FyZyAmIENIUl9USU9DTV9E VFIpDQogICAgICAgICAgICAgICAgIHRhcmcgfD0gVElPQ01fRFRSOw0KLSAgICAgICAgICAg IGlmIChzYXJnIHwgQ0hSX1RJT0NNX1JUUykNCisgICAgICAgICAgICBpZiAoc2FyZyAmIENI Ul9USU9DTV9SVFMpDQogICAgICAgICAgICAgICAgIHRhcmcgfD0gVElPQ01fUlRTOw0KICAg ICAgICAgICAgIGlvY3RsKHMtPmZkX2luLCBUSU9DTVNFVCwgJnRhcmcpOw0KICAgICAgICAg fQ0KICAgICAgICAgYnJlYWs7DQogICAgIGRlZmF1bHQ6DQogICAgICAgICByZXR1cm4gLUVO T1RTVVA7DQogICAgIH0NCiAgICAgcmV0dXJuIDA7DQo= ------------976D1DD2B84FC0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------------976D1DD2B84FC0--