Patchwork [Trivial] acpitable: open the data file in binary mode

login
register
mail settings
Submitter Michael Tokarev
Date Jan. 17, 2013, 10:53 a.m.
Message ID <1358420032-25275-1-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/213202/
State New
Headers show

Comments

Michael Tokarev - Jan. 17, 2013, 10:53 a.m.
-acpitable {file|data}=file reads the content of file, but it is
in binary form, so the file should be opened usin O_BINARY flag.
On *nix it is a no-op, but on windows and other weird platform
it is really needed.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Stefan Hajnoczi - Jan. 18, 2013, 1:44 p.m.
On Thu, Jan 17, 2013 at 02:53:52PM +0400, Michael Tokarev wrote:
> -acpitable {file|data}=file reads the content of file, but it is
> in binary form, so the file should be opened usin O_BINARY flag.
> On *nix it is a no-op, but on windows and other weird platform
> it is really needed.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  hw/acpi.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/hw/acpi.c b/hw/acpi.c
index 5d521e5..49510be 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -115,7 +115,7 @@  int acpi_table_add(const char *t)
     /* now read in the data files, reallocating buffer as needed */
 
     for (f = strtok(buf, ":"); f; f = strtok(NULL, ":")) {
-        int fd = open(f, O_RDONLY);
+        int fd = open(f, O_RDONLY | O_BINARY);
 
         if (fd < 0) {
             fprintf(stderr, "can't open file %s: %s\n", f, strerror(errno));