From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGdXM-0000uP-Es for qemu-devel@nongnu.org; Tue, 16 Jun 2009 14:37:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGdXI-0000rQ-Tf for qemu-devel@nongnu.org; Tue, 16 Jun 2009 14:37:36 -0400 Received: from [199.232.76.173] (port=42177 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGdXI-0000rD-KH for qemu-devel@nongnu.org; Tue, 16 Jun 2009 14:37:32 -0400 Received: from mail-fx0-f209.google.com ([209.85.220.209]:39923) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGdXH-0001z6-W5 for qemu-devel@nongnu.org; Tue, 16 Jun 2009 14:37:32 -0400 Received: by fxm5 with SMTP id 5so1563249fxm.34 for ; Tue, 16 Jun 2009 11:37:30 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <4A37896C.8050208@redhat.com> Date: Tue, 16 Jun 2009 21:37:30 +0300 Message-ID: Subject: Re: [Qemu-devel] Regression opening read-only cdroms From: Blue Swirl Content-Type: multipart/mixed; boundary=001636c5a440a3a449046c7b7732 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Christoph Hellwig , qemu-devel --001636c5a440a3a449046c7b7732 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 6/16/09, Blue Swirl wrote: > On 6/16/09, Avi Kivity wrote: > > qemu used to be quite happy opening read-only cdrom images, and I was quite > > happy feeding kvm-autotest a library of read-only iso images. However since > > > > commit 0e1d8f4c549e51fd19793a154862979fdc199477 > > Author: Christoph Hellwig > > Date: Mon Jun 15 13:53:26 2009 +0200 > > > > raw-posix: always store open flags > > > > Both the Linux floppy and the FreeBSD CDROM host device need to > > store > > the open flags so that they can re-open the device later. Store > > the > > open flags unconditionally to remove the ifdef mess and simply the > > calling conventions for the later patches in the series. > > > > Signed-off-by: Christoph Hellwig > > > > this state of happiness no longer exists. > > > > Can you look at what caused this? > > > How about these: > - open_flags = O_BINARY; > + s->open_flags |= O_BINARY; > - open_flags = O_BINARY; > + s->open_flags |= O_BINARY; Fix attached, could you test it? --001636c5a440a3a449046c7b7732 Content-Type: application/x-patch; name="0001-Fix-opening-of-read-only-raw-images.patch" Content-Disposition: attachment; filename="0001-Fix-opening-of-read-only-raw-images.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fw0yf7an RnJvbSAyZTIxOGNhNTc1MTYzMjNhMDQ1YjJhY2U1OTRlMGM4OGU0NDlhNGNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KRGF0 ZTogVHVlLCAxNiBKdW4gMjAwOSAxODozMzoyMiArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBv cGVuaW5nIG9mIHJlYWQgb25seSByYXcgaW1hZ2VzCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJs IDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KLS0tCiBibG9jay9yYXctcG9zaXguYyB8ICAgMzEgKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRp b25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ibG9jay9yYXctcG9zaXguYyBi L2Jsb2NrL3Jhdy1wb3NpeC5jCmluZGV4IDUwMzIzNDguLjhiZjQ1Y2UgMTAwNjQ0Ci0tLSBhL2Js b2NrL3Jhdy1wb3NpeC5jCisrKyBiL2Jsb2NrL3Jhdy1wb3NpeC5jCkBAIC0xMjMsNyArMTIzLDcg QEAgc3RhdGljIGludCBjZHJvbV9yZW9wZW4oQmxvY2tEcml2ZXJTdGF0ZSAqYnMpOwogI2VuZGlm CiAKIHN0YXRpYyBpbnQgcmF3X29wZW5fY29tbW9uKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBjb25z dCBjaGFyICpmaWxlbmFtZSwKLSAgICAgICAgaW50IGZsYWdzKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50IGJkcnZfZmxhZ3MsIGludCBvcGVuX2ZsYWdzKQogewogICAgIEJEUlZSYXdT dGF0ZSAqcyA9IGJzLT5vcGFxdWU7CiAgICAgaW50IGZkLCByZXQ7CkBAIC0xMzIsOCArMTMyLDgg QEAgc3RhdGljIGludCByYXdfb3Blbl9jb21tb24oQmxvY2tEcml2ZXJTdGF0ZSAqYnMsIGNvbnN0 IGNoYXIgKmZpbGVuYW1lLAogCiAgICAgcy0+bHNlZWtfZXJyX2NudCA9IDA7CiAKLSAgICBzLT5v cGVuX2ZsYWdzIHw9IE9fQklOQVJZOwotICAgIGlmICgoZmxhZ3MgJiBCRFJWX09fQUNDRVNTKSA9 PSBPX1JEV1IpIHsKKyAgICBzLT5vcGVuX2ZsYWdzID0gb3Blbl9mbGFncyB8IE9fQklOQVJZOwor ICAgIGlmICgoYmRydl9mbGFncyAmIEJEUlZfT19BQ0NFU1MpID09IE9fUkRXUikgewogICAgICAg ICBzLT5vcGVuX2ZsYWdzIHw9IE9fUkRXUjsKICAgICB9IGVsc2UgewogICAgICAgICBzLT5vcGVu X2ZsYWdzIHw9IE9fUkRPTkxZOwpAQCAtMTQyLDkgKzE0Miw5IEBAIHN0YXRpYyBpbnQgcmF3X29w ZW5fY29tbW9uKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBjb25zdCBjaGFyICpmaWxlbmFtZSwKIAog ICAgIC8qIFVzZSBPX0RTWU5DIGZvciB3cml0ZS10aHJvdWdoIGNhY2hpbmcsIG5vIGZsYWdzIGZv ciB3cml0ZS1iYWNrIGNhY2hpbmcsCiAgICAgICogYW5kIE9fRElSRUNUIGZvciBubyBjYWNoaW5n LiAqLwotICAgIGlmICgoZmxhZ3MgJiBCRFJWX09fTk9DQUNIRSkpCisgICAgaWYgKChiZHJ2X2Zs YWdzICYgQkRSVl9PX05PQ0FDSEUpKQogICAgICAgICBzLT5vcGVuX2ZsYWdzIHw9IE9fRElSRUNU OwotICAgIGVsc2UgaWYgKCEoZmxhZ3MgJiBCRFJWX09fQ0FDSEVfV0IpKQorICAgIGVsc2UgaWYg KCEoYmRydl9mbGFncyAmIEJEUlZfT19DQUNIRV9XQikpCiAgICAgICAgIHMtPm9wZW5fZmxhZ3Mg fD0gT19EU1lOQzsKIAogICAgIHMtPmZkID0gLTE7CkBAIC0xNTcsNyArMTU3LDcgQEAgc3RhdGlj IGludCByYXdfb3Blbl9jb21tb24oQmxvY2tEcml2ZXJTdGF0ZSAqYnMsIGNvbnN0IGNoYXIgKmZp bGVuYW1lLAogICAgIH0KICAgICBzLT5mZCA9IGZkOwogICAgIHMtPmFsaWduZWRfYnVmID0gTlVM TDsKLSAgICBpZiAoKGZsYWdzICYgQkRSVl9PX05PQ0FDSEUpKSB7CisgICAgaWYgKChiZHJ2X2Zs YWdzICYgQkRSVl9PX05PQ0FDSEUpKSB7CiAgICAgICAgIHMtPmFsaWduZWRfYnVmID0gcWVtdV9i bG9ja2FsaWduKGJzLCBBTElHTkVEX0JVRkZFUl9TSVpFKTsKICAgICAgICAgaWYgKHMtPmFsaWdu ZWRfYnVmID09IE5VTEwpIHsKICAgICAgICAgICAgIHJldCA9IC1lcnJubzsKQEAgLTE3MSwxMiAr MTcxLDEzIEBAIHN0YXRpYyBpbnQgcmF3X29wZW5fY29tbW9uKEJsb2NrRHJpdmVyU3RhdGUgKmJz LCBjb25zdCBjaGFyICpmaWxlbmFtZSwKIHN0YXRpYyBpbnQgcmF3X29wZW4oQmxvY2tEcml2ZXJT dGF0ZSAqYnMsIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBpbnQgZmxhZ3MpCiB7CiAgICAgQkRSVlJh d1N0YXRlICpzID0gYnMtPm9wYXF1ZTsKKyAgICBpbnQgb3Blbl9mbGFncyA9IDA7CiAKICAgICBz LT50eXBlID0gRlRZUEVfRklMRTsKICAgICBpZiAoZmxhZ3MgJiBCRFJWX09fQ1JFQVQpCi0gICAg ICAgIHMtPm9wZW5fZmxhZ3MgfD0gT19DUkVBVCB8IE9fVFJVTkM7CisgICAgICAgIG9wZW5fZmxh Z3MgPSBPX0NSRUFUIHwgT19UUlVOQzsKIAotICAgIHJldHVybiByYXdfb3Blbl9jb21tb24oYnMs IGZpbGVuYW1lLCBmbGFncyk7CisgICAgcmV0dXJuIHJhd19vcGVuX2NvbW1vbihicywgZmlsZW5h bWUsIGZsYWdzLCBvcGVuX2ZsYWdzKTsKIH0KIAogLyogWFhYOiB1c2UgaG9zdCBzZWN0b3Igc2l6 ZSBpZiBuZWNlc3Nhcnkgd2l0aDoKQEAgLTEwMDcsNyArMTAwOCw3IEBAIHN0YXRpYyBpbnQgaGRl dl9vcGVuKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBjb25zdCBjaGFyICpmaWxlbmFtZSwgaW50IGZs YWdzKQogICAgIH0KICNlbmRpZgogCi0gICAgcmV0dXJuIHJhd19vcGVuX2NvbW1vbihicywgZmls ZW5hbWUsIGZsYWdzKTsKKyAgICByZXR1cm4gcmF3X29wZW5fY29tbW9uKGJzLCBmaWxlbmFtZSwg ZmxhZ3MsIDApOwogfQogCiAjaWYgZGVmaW5lZChfX2xpbnV4X18pCkBAIC0xMTg1LDEwICsxMTg2 LDkgQEAgc3RhdGljIGludCBmbG9wcHlfb3BlbihCbG9ja0RyaXZlclN0YXRlICpicywgY29uc3Qg Y2hhciAqZmlsZW5hbWUsIGludCBmbGFncykKICAgICBwb3NpeF9haW9faW5pdCgpOwogCiAgICAg cy0+dHlwZSA9IEZUWVBFX0ZEOwotICAgIC8qIG9wZW4gd2lsbCBub3QgZmFpbCBldmVuIGlmIG5v IGZsb3BweSBpcyBpbnNlcnRlZCAqLwotICAgIHMtPm9wZW5fZmxhZ3MgfD0gT19OT05CTE9DSzsK IAotICAgIHJldCA9IHJhd19vcGVuX2NvbW1vbihicywgZmlsZW5hbWUsIGZsYWdzKTsKKyAgICAv KiBvcGVuIHdpbGwgbm90IGZhaWwgZXZlbiBpZiBubyBmbG9wcHkgaXMgaW5zZXJ0ZWQsIHNvIGFk ZCBPX05PTkJMT0NLICovCisgICAgcmV0ID0gcmF3X29wZW5fY29tbW9uKGJzLCBmaWxlbmFtZSwg ZmxhZ3MsIE9fTk9OQkxPQ0spOwogICAgIGlmIChyZXQpCiAgICAgICAgIHJldHVybiByZXQ7CiAK QEAgLTEyNzgsMTEgKzEyNzgsMTAgQEAgc3RhdGljIGludCBjZHJvbV9vcGVuKEJsb2NrRHJpdmVy U3RhdGUgKmJzLCBjb25zdCBjaGFyICpmaWxlbmFtZSwgaW50IGZsYWdzKQogewogICAgIEJEUlZS YXdTdGF0ZSAqcyA9IGJzLT5vcGFxdWU7CiAKLSAgICAvKiBvcGVuIHdpbGwgbm90IGZhaWwgZXZl biBpZiBubyBDRCBpcyBpbnNlcnRlZCAqLwotICAgIHMtPm9wZW5fZmxhZ3MgfD0gT19OT05CTE9D SzsKICAgICBzLT50eXBlID0gRlRZUEVfQ0Q7CiAKLSAgICByZXR1cm4gcmF3X29wZW5fY29tbW9u KGJzLCBmaWxlbmFtZSwgZmxhZ3MpOworICAgIC8qIG9wZW4gd2lsbCBub3QgZmFpbCBldmVuIGlm IG5vIENEIGlzIGluc2VydGVkLCBzbyBhZGQgT19OT05CTE9DSyAqLworICAgIHJldHVybiByYXdf b3Blbl9jb21tb24oYnMsIGZpbGVuYW1lLCBmbGFncywgT19OT05CTE9DSyk7CiB9CiAKIHN0YXRp YyBpbnQgY2Ryb21fcHJvYmVfZGV2aWNlKGNvbnN0IGNoYXIgKmZpbGVuYW1lKQpAQCAtMTM3Miw3 ICsxMzcxLDcgQEAgc3RhdGljIGludCBjZHJvbV9vcGVuKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBj b25zdCBjaGFyICpmaWxlbmFtZSwgaW50IGZsYWdzKQogCiAgICAgcy0+dHlwZSA9IEZUWVBFX0NE OwogCi0gICAgcmV0ID0gcmF3X29wZW5fY29tbW9uKGJzLCBmaWxlbmFtZSwgZmxhZ3MpOworICAg IHJldCA9IHJhd19vcGVuX2NvbW1vbihicywgZmlsZW5hbWUsIGZsYWdzLCAwKTsKICAgICBpZiAo cmV0KQogICAgICAgICByZXR1cm4gcmV0OwogCi0tIAoxLjUuNi41Cgo= --001636c5a440a3a449046c7b7732--