From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GXgjG-0007Im-DO for qemu-devel@nongnu.org; Wed, 11 Oct 2006 12:14:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GXgjD-0007Dy-KH for qemu-devel@nongnu.org; Wed, 11 Oct 2006 12:14:44 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GXgjD-0007Cv-13 for qemu-devel@nongnu.org; Wed, 11 Oct 2006 12:14:43 -0400 Received: from [72.14.204.236] (helo=qb-out-0506.google.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GXgrD-0007S1-SY for qemu-devel@nongnu.org; Wed, 11 Oct 2006 12:23:00 -0400 Received: by qb-out-0506.google.com with SMTP id a39so741984qbd for ; Wed, 11 Oct 2006 09:14:38 -0700 (PDT) Message-ID: Date: Wed, 11 Oct 2006 18:14:37 +0200 From: "Pascal Terjan" In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_23569_28844037.1160583277486" References: Subject: [Qemu-devel] Re: Patch to see all tracks on CDROM Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_23569_28844037.1160583277486 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Stupid bug, here is one working when not using -snapshot ------=_Part_23569_28844037.1160583277486 Content-Type: text/x-patch; name="qemu-cdrom-multi_track.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="qemu-cdrom-multi_track.patch" X-Attachment-Id: f_et5xb0dx SW5kZXg6IGh3L2Nkcm9tLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3NvdXJjZXMvcWVtdS9xZW11 L2h3L2Nkcm9tLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMQpkaWZmIC11IC1yMS4xIGNkcm9t LmMKLS0tIGh3L2Nkcm9tLmMJMjUgTWF5IDIwMDYgMjM6NTg6NTEgLTAwMDAJMS4xCisrKyBody9j ZHJvbS5jCTExIE9jdCAyMDA2IDE2OjExOjEzIC0wMDAwCkBAIC0yNiw2ICsyNiwxNCBAQAogICAg aGVyZS4gICovCiAKICNpbmNsdWRlIDx2bC5oPgorI2luY2x1ZGUgImJsb2NrX2ludC5oIgorCisj aWYgZGVmaW5lZChfX2xpbnV4X18pCisjaW5jbHVkZSA8c3lzL2lvY3RsLmg+CisjaW5jbHVkZSA8 bGludXgvY2Ryb20uaD4KKyNlbmRpZgorCitleHRlcm4gQmxvY2tEcml2ZXJTdGF0ZSAqYmRydl9m aXJzdDsKIAogc3RhdGljIHZvaWQgbGJhX3RvX21zZih1aW50OF90ICpidWYsIGludCBsYmEpCiB7 CkBAIC0zOSw0NSArNDcsMTI1IEBACiAvKiBYWFg6IGNoZWNrIHRoaXMgKi8KIGludCBjZHJvbV9y ZWFkX3RvYyhpbnQgbmJfc2VjdG9ycywgdWludDhfdCAqYnVmLCBpbnQgbXNmLCBpbnQgc3RhcnRf dHJhY2spCiB7Ci0gICAgdWludDhfdCAqcTsKLSAgICBpbnQgbGVuOwotICAgIAotICAgIGlmIChz dGFydF90cmFjayA+IDEgJiYgc3RhcnRfdHJhY2sgIT0gMHhhYSkKLSAgICAgICAgcmV0dXJuIC0x OwotICAgIHEgPSBidWYgKyAyOwotICAgICpxKysgPSAxOyAvKiBmaXJzdCBzZXNzaW9uICovCi0g ICAgKnErKyA9IDE7IC8qIGxhc3Qgc2Vzc2lvbiAqLwotICAgIGlmIChzdGFydF90cmFjayA8PSAx KSB7Ci0gICAgICAgICpxKysgPSAwOyAvKiByZXNlcnZlZCAqLwotICAgICAgICAqcSsrID0gMHgx NDsgLyogQURSLCBjb250cm9sICovCi0gICAgICAgICpxKysgPSAxOyAgICAvKiB0cmFjayBudW1i ZXIgKi8KLSAgICAgICAgKnErKyA9IDA7IC8qIHJlc2VydmVkICovCi0gICAgICAgIGlmIChtc2Yp IHsKLSAgICAgICAgICAgICpxKysgPSAwOyAvKiByZXNlcnZlZCAqLwotICAgICAgICAgICAgbGJh X3RvX21zZihxLCAwKTsKLSAgICAgICAgICAgIHEgKz0gMzsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIC8qIHNlY3RvciAwICovCi0gICAgICAgICAgICBjcHVfdG9fYmUzMnd1KCh1aW50 MzJfdCAqKXEsIDApOwotICAgICAgICAgICAgcSArPSA0OwotICAgICAgICB9CisgIHVpbnQ4X3Qg KnE7CisgIGludCBsZW47CisgIGludCBpOworICBjaGFyICogZmlsZW5hbWUgPSBOVUxMOworCisg IC8qIEZpbmQgdGhlIGRldmljZSBmaWxlbmFtZSAqLworICBCbG9ja0RyaXZlclN0YXRlICpiczsK KworICBmb3IgKGJzID0gYmRydl9maXJzdDsgYnMgIT0gTlVMTDsgYnMgPSBicy0+bmV4dCkgewor ICAgIGlmKGJzLT50eXBlID09IEJEUlZfVFlQRV9DRFJPTSkgeworICAgICAgLyogTG9va3MgbGlr ZSAtc25hcHNob3QgYWxzbyBhcHBsaWVzIHRvIENEICovCisgICAgICBpZihicy0+YmFja2luZ19m aWxlWzBdKSB7CisJZmlsZW5hbWUgPSBicy0+YmFja2luZ19maWxlOworICAgICAgfSBlbHNlIHsK KwlmaWxlbmFtZSA9IGJzLT5maWxlbmFtZTsKKyAgICAgIH0KICAgICB9Ci0gICAgLyogbGVhZCBv dXQgdHJhY2sgKi8KLSAgICAqcSsrID0gMDsgLyogcmVzZXJ2ZWQgKi8KLSAgICAqcSsrID0gMHgx NjsgLyogQURSLCBjb250cm9sICovCi0gICAgKnErKyA9IDB4YWE7IC8qIHRyYWNrIG51bWJlciAq LwotICAgICpxKysgPSAwOyAvKiByZXNlcnZlZCAqLworICB9CisKKyAgaW50IGZkID0gMDsKKyNp ZiBkZWZpbmVkKF9fbGludXhfXykKKyAgZmQgPSBvcGVuKGZpbGVuYW1lLCBPX1JET05MWSk7Cisg IGlmKGZkPDApIHsKKyAgICByZXR1cm4gLTE7CisgIH0KKyNlbmRpZgorCisgIHN0cnVjdCBjZHJv bV90b2NoZHIgdG9jaGRyOworI2lmIGRlZmluZWQoX19saW51eF9fKQorICBpZiAoaW9jdGwoZmQs IENEUk9NUkVBRFRPQ0hEUiwgJnRvY2hkcikpIHsKKyAgICAvKiBJZiB3ZSBoYXZlIGEgZmlsZSBh bmQgbm90IGEgcmVhbCBDRC1ST00sIHJldmVydCB0byBvbGQgYmVoYXZpb3VyICovCisgICAgLypG SVhNRSBXZSBzaG91bGQgcmF0aGVyIGNoZWNrIGJzLT5kcnYgKi8KKyAgICBjbG9zZShmZCk7Cisg ICAgZmQgPSAwOworI2Vsc2UKKyAgeworI2VuZGlmCisgICAgdG9jaGRyLmNkdGhfdHJrMCA9IDE7 CisgICAgdG9jaGRyLmNkdGhfdHJrMSA9IDE7CisgICAgIAorICB9CisKKyAgaWYgKChzdGFydF90 cmFjayA+IHRvY2hkci5jZHRoX3RyazEpICYmIChzdGFydF90cmFjayAhPSAweGFhKSkgeworICAg IGlmIChmZCkKKyAgICAgIGNsb3NlKGZkKTsKKyAgICByZXR1cm4gLTE7CisgIH0KKyAgCisgIGlm IChzdGFydF90cmFjayA8IHRvY2hkci5jZHRoX3RyazApCisgICAgc3RhcnRfdHJhY2sgPSB0b2No ZHIuY2R0aF90cmswOworICAKKyAgcSA9IGJ1ZiArIDI7CisgICpxKysgPSB0b2NoZHIuY2R0aF90 cmswOyAvKiBmaXJzdCBzZXNzaW9uICovCisgICpxKysgPSB0b2NoZHIuY2R0aF90cmsxOyAvKiBs YXN0IHNlc3Npb24gKi8KKyAgCisgIGZvciAoaSA9IHN0YXJ0X3RyYWNrOyBpIDw9IHRvY2hkci5j ZHRoX3RyazE7IGkrKykgeworICAgIHN0cnVjdCBjZHJvbV90b2NlbnRyeSB0b2NlbnRyeTsKKwor I2lmIGRlZmluZWQoX19saW51eF9fKQorICAgIHRvY2VudHJ5LmNkdGVfZm9ybWF0ID0gKG1zZikg PyBDRFJPTV9NU0YgOiBDRFJPTV9MQkE7CisgICAgdG9jZW50cnkuY2R0ZV90cmFjayA9IGk7Cisg ICAgaWYgKGZkKSB7CisgICAgICBpZiAoaW9jdGwoZmQsIENEUk9NUkVBRFRPQ0VOVFJZLCAmdG9j ZW50cnkpKSB7CisJcGVycm9yKCJjZHJvbTogcmVhZF90b2M6IFJFQURUT0NFTlRSWSBsZWFkLW91 dCBmYWlsZWQiKTsKKwljbG9zZShmZCk7CisJcmV0dXJuIC0xOworICAgICAgfQorICAgIH0gZWxz ZSB7CisjZWxzZQorICAgIHsKKyNlbmRpZgorICAgICAgdG9jZW50cnkuY2R0ZV9hZHIgPSAwOwor ICAgICAgdG9jZW50cnkuY2R0ZV9jdHJsID0gMHgxNDsKKyAgICAgIGlmIChtc2YpIHsKKwl0b2Nl bnRyeS5jZHRlX2FkZHIubXNmLm1pbnV0ZSA9IDA7CisJdG9jZW50cnkuY2R0ZV9hZGRyLm1zZi5z ZWNvbmQgPSAyOworCXRvY2VudHJ5LmNkdGVfYWRkci5tc2YuZnJhbWUgPSAwOworICAgICAgfSBl bHNlIHsKKwl0b2NlbnRyeS5jZHRlX2FkZHIubGJhID0gMDsKKyAgICAgIH0KKyAgICB9CisgICAg ICAKKyAgICAqcSsrID0gMDsgLy8gUmVzZXJ2ZWQKKyAgICAqcSsrID0gKHRvY2VudHJ5LmNkdGVf YWRyIDw8IDQpIHwgdG9jZW50cnkuY2R0ZV9jdHJsIDsgLy8gQURSLCBjb250cm9sCisgICAgKnEr KyA9IGk7IC8vIFRyYWNrIG51bWJlcgorICAgICpxKysgPSAwOyAvLyBSZXNlcnZlZAorICAgIAor ICAgIC8vIFN0YXJ0IGFkZHJlc3MKICAgICBpZiAobXNmKSB7Ci0gICAgICAgICpxKysgPSAwOyAv KiByZXNlcnZlZCAqLwotICAgICAgICBsYmFfdG9fbXNmKHEsIG5iX3NlY3RvcnMpOwotICAgICAg ICBxICs9IDM7CisgICAgICAqcSsrID0gMDsgLy8gcmVzZXJ2ZWQKKyAgICAgICpxKysgPSB0b2Nl bnRyeS5jZHRlX2FkZHIubXNmLm1pbnV0ZTsKKyAgICAgICpxKysgPSB0b2NlbnRyeS5jZHRlX2Fk ZHIubXNmLnNlY29uZDsKKyAgICAgICpxKysgPSB0b2NlbnRyeS5jZHRlX2FkZHIubXNmLmZyYW1l OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGNwdV90b19iZTMyd3UoKHVpbnQzMl90ICopcSwgbmJf c2VjdG9ycyk7Ci0gICAgICAgIHEgKz0gNDsKKyAgICAgICpxKysgPSAoKCh1bnNpZ25lZCl0b2Nl bnRyeS5jZHRlX2FkZHIubGJhKSA+PiAyNCkgJiAweGZmOworICAgICAgKnErKyA9ICgoKHVuc2ln bmVkKXRvY2VudHJ5LmNkdGVfYWRkci5sYmEpID4+IDE2KSAmIDB4ZmY7CisgICAgICAqcSsrID0g KCgodW5zaWduZWQpdG9jZW50cnkuY2R0ZV9hZGRyLmxiYSkgPj4gOCkgJiAweGZmOworICAgICAg KnErKyA9ICgoKHVuc2lnbmVkKXRvY2VudHJ5LmNkdGVfYWRkci5sYmEpID4+IDApICYgMHhmZjsK ICAgICB9Ci0gICAgbGVuID0gcSAtIGJ1ZjsKLSAgICBjcHVfdG9fYmUxNnd1KCh1aW50MTZfdCAq KWJ1ZiwgbGVuIC0gMik7Ci0gICAgcmV0dXJuIGxlbjsKKyAgfQorCisgIC8qIGxlYWQgb3V0IHRy YWNrICovCisgICpxKysgPSAwOyAvKiByZXNlcnZlZCAqLworICAqcSsrID0gMHgxNjsgLyogQURS LCBjb250cm9sICovCisgICpxKysgPSAweGFhOyAvKiB0cmFjayBudW1iZXIgKi8KKyAgKnErKyA9 IDA7IC8qIHJlc2VydmVkICovCisgIGlmIChtc2YpIHsKKyAgICAqcSsrID0gMDsgLyogcmVzZXJ2 ZWQgKi8KKyAgICBsYmFfdG9fbXNmKHEsIG5iX3NlY3RvcnMpOworICAgIHEgKz0gMzsKKyAgfSBl bHNlIHsKKyAgICBjcHVfdG9fYmUzMnd1KCh1aW50MzJfdCAqKXEsIG5iX3NlY3RvcnMpOworICAg IHEgKz0gNDsKKyAgfQorICBsZW4gPSBxIC0gYnVmOworICBjcHVfdG9fYmUxNnd1KCh1aW50MTZf dCAqKWJ1ZiwgbGVuIC0gMik7CisgIGlmIChmZCkKKyAgICBjbG9zZShmZCk7CisgIHJldHVybiBs ZW47CiB9CiAKIC8qIG1vc3RseSBzYW1lIGluZm8gYXMgUGVhclBjICovCkBAIC0xNTIsNSArMjQw LDMgQEAKICAgICBjcHVfdG9fYmUxNnd1KCh1aW50MTZfdCAqKWJ1ZiwgbGVuIC0gMik7CiAgICAg cmV0dXJuIGxlbjsKIH0KLQotCkluZGV4OiBibG9jay5jCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9z b3VyY2VzL3FlbXUvcWVtdS9ibG9jay5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjM3CmRpZmYg LXUgLXIxLjM3IGJsb2NrLmMKLS0tIGJsb2NrLmMJMjQgQXVnIDIwMDYgMTk6NTM6MzcgLTAwMDAJ MS4zNworKysgYmxvY2suYwkxMSBPY3QgMjAwNiAxNjoxMToxNCAtMDAwMApAQCAtNTMsNyArNTMs NyBAQAogc3RhdGljIGludCBiZHJ2X3dyaXRlX2VtKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBpbnQ2 NF90IHNlY3Rvcl9udW0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgdWludDhfdCAq YnVmLCBpbnQgbmJfc2VjdG9ycyk7CiAKLXN0YXRpYyBCbG9ja0RyaXZlclN0YXRlICpiZHJ2X2Zp cnN0OworQmxvY2tEcml2ZXJTdGF0ZSAqYmRydl9maXJzdDsKIHN0YXRpYyBCbG9ja0RyaXZlciAq Zmlyc3RfZHJ2OwogCiAjaWZkZWYgX1dJTjMyCg== ------=_Part_23569_28844037.1160583277486--