From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MFlNo-0007qZ-Kh for qemu-devel@nongnu.org; Sun, 14 Jun 2009 04:48:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MFlNk-0007qB-0p for qemu-devel@nongnu.org; Sun, 14 Jun 2009 04:48:08 -0400 Received: from [199.232.76.173] (port=55765 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MFlNj-0007q8-TD for qemu-devel@nongnu.org; Sun, 14 Jun 2009 04:48:03 -0400 Received: from mail-ew0-f224.google.com ([209.85.219.224]:40633) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MFlNh-0003Kr-S2 for qemu-devel@nongnu.org; Sun, 14 Jun 2009 04:48:03 -0400 Received: by ewy24 with SMTP id 24so360828ewy.34 for ; Sun, 14 Jun 2009 01:47:53 -0700 (PDT) MIME-Version: 1.0 Date: Sun, 14 Jun 2009 10:47:52 +0200 Message-ID: <5b31733c0906140147hcd97db4ja4c5c4b4bdac1718@mail.gmail.com> From: Filip Navara Content-Type: multipart/mixed; boundary=0016364d2303420165046c4aff0e Subject: [Qemu-devel] [PATCH] Add O_BINARY to open call in net_dump_init. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --0016364d2303420165046c4aff0e Content-Type: multipart/alternative; boundary=0016364d2303420157046c4aff0c --0016364d2303420157046c4aff0c Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Fix the pcap dumps on Win32 and other systems where O_BINARY is required. Signed-off-by: Filip Navara --0016364d2303420157046c4aff0c Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Fix the pcap dumps on Win32 and other systems where O_BINARY is required.

Signed-off-by: Filip Navara <filip.navara@gmail.com>

--0016364d2303420157046c4aff0c-- --0016364d2303420165046c4aff0e Content-Type: application/octet-stream; name="0001-Add-O_BINARY-to-open-call-in-net_dump_init.patch" Content-Disposition: attachment; filename="0001-Add-O_BINARY-to-open-call-in-net_dump_init.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fvxihq4g0 RnJvbSA3NmM3NDk1ZmU1ODQwZWRlZTFhMDQ5NzllYmE3MWY4MmEyYzUwNGFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGaWxpcCBOYXZhcmEgPGZpbGlwLm5hdmFyYUBnbWFpbC5jb20+ CkRhdGU6IFN1biwgMTQgSnVuIDIwMDkgMTA6NDM6MDYgKzAyMDAKU3ViamVjdDogW1BBVENIXSBB ZGQgT19CSU5BUlkgdG8gb3BlbiBjYWxsIGluIG5ldF9kdW1wX2luaXQuCgotLS0KIG5ldC5jIHwg ICAgMyArLS0KIDEgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL25ldC5jIGIvbmV0LmMKaW5kZXggYWY5ZGU3My4uNjU4MTBhMCAxMDA2 NDQKLS0tIGEvbmV0LmMKKysrIGIvbmV0LmMKQEAgLTEyNCw3ICsxMjQsNiBAQAogI2luY2x1ZGUg ImxpYnNsaXJwLmgiCiAjZW5kaWYKIAotCiBzdGF0aWMgVkxBTlN0YXRlICpmaXJzdF92bGFuOwog CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKiovCkBAIC0xOTkwLDcgKzE5ODksNyBAQCBzdGF0aWMgaW50IG5ldF9kdW1wX2luaXQoTW9u aXRvciAqbW9uLCBWTEFOU3RhdGUgKnZsYW4sIGNvbnN0IGNoYXIgKmRldmljZSwKIAogICAgIHMg PSBxZW11X21hbGxvYyhzaXplb2YoRHVtcFN0YXRlKSk7CiAKLSAgICBzLT5mZCA9IG9wZW4oZmls ZW5hbWUsIE9fQ1JFQVQgfCBPX1dST05MWSwgMDY0NCk7CisgICAgcy0+ZmQgPSBvcGVuKGZpbGVu YW1lLCBPX0NSRUFUIHwgT19XUk9OTFkgfCBPX0JJTkFSWSwgMDY0NCk7CiAgICAgaWYgKHMtPmZk IDwgMCkgewogICAgICAgICBjb25maWdfZXJyb3IobW9uLCAiLW5ldCBkdW1wOiBjYW4ndCBvcGVu ICVzXG4iLCBmaWxlbmFtZSk7CiAgICAgICAgIHJldHVybiAtMTsKLS0gCjEuNi4zLm1zeXNnaXQu MAoK --0016364d2303420165046c4aff0e-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGzFD-0001Bk-5L for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:48:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGzF8-0001A3-BQ for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:48:18 -0400 Received: from [199.232.76.173] (port=53064 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGzF8-0001A0-3y for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:48:14 -0400 Received: from mail-fx0-f209.google.com ([209.85.220.209]:58498) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGzF7-0005ug-NT for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:48:13 -0400 Received: by fxm5 with SMTP id 5so477054fxm.34 for ; Wed, 17 Jun 2009 10:48:12 -0700 (PDT) Message-ID: <4A392C58.4090609@gmail.com> Date: Wed, 17 Jun 2009 19:48:08 +0200 From: Filip Navara MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Add O_BINARY to open call in net_dump_init. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Fix the pcap dumps on Win32 and other systems where O_BINARY is required. Signed-off-by: Filip Navara > --- net.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index af9de73..65810a0 100644 --- a/net.c +++ b/net.c @@ -124,7 +124,6 @@ #include "libslirp.h" #endif - static VLANState *first_vlan; /***********************************************************/ @@ -1990,7 +1989,7 @@ static int net_dump_init(Monitor *mon, VLANState *vlan, const char *device, s = qemu_malloc(sizeof(DumpState)); - s->fd = open(filename, O_CREAT | O_WRONLY, 0644); + s->fd = open(filename, O_CREAT | O_WRONLY | O_BINARY, 0644); if (s->fd < 0) { config_error(mon, "-net dump: can't open %s\n", filename); return -1; -- 1.6.3.msysgit.0