[Qemu-devel] [PULL for-1.4 0/4] Trivial patches for 16 to 21 January 2013

[Qemu-devel] [PULL for-1.4 0/4] Trivial patches for 16 to 21 January 2013

[Stefan Hajnoczi]

These fixes are for QEMU 1.4.

The following changes since commit 8b17ed4caa7e015324a4ecbe3c863e32458d840a:

  Merge remote-tracking branch 'stefanha/block' into staging (2013-01-20 11:01:10 -0600)

are available in the git repository at:


  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to 09a021fb7ceb7255ab106999d7b38ffd92c3bdd6:

  hw/tpci200: Fix compiler warning (redefined symbol with MinGW) (2013-01-21 11:39:15 +0100)

----------------------------------------------------------------
Michael Tokarev (1):
      acpitable: open the data file in binary mode

Stefan Weil (2):
      hw: Spelling fix in log message
      hw/tpci200: Fix compiler warning (redefined symbol with MinGW)

Vadim Evard (1):
      configure: silence pkg-config's check for curses

 configure         | 2 +-
 hw/acpi.c         | 2 +-
 hw/openrisc_sim.c | 2 +-
 hw/tpci200.c      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.8.1

[Qemu-devel] [PATCH 1/4] hw: Spelling fix in log message

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

defineition -> definition

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Andreas F=E4rber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/openrisc_sim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index fb47cdc..6c443ba 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -107,7 +107,7 @@ static void openrisc_sim_init(QEMUMachineInitArgs *args)
     for (n = 0; n < smp_cpus; n++) {
         cpu = cpu_openrisc_init(cpu_model);
         if (cpu == NULL) {
-            qemu_log("Unable to find CPU defineition!\n");
+            qemu_log("Unable to find CPU definition!\n");
             exit(1);
         }
         qemu_register_reset(main_cpu_reset, cpu);
-- 
1.8.1

[Qemu-devel] [PATCH 2/4] acpitable: open the data file in binary mode

[Stefan Hajnoczi]

From: Michael Tokarev <mjt@tls.msk.ru>

-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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/acpi.c b/hw/acpi.c
index 97617c4..8c9dcc5 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -104,7 +104,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));
-- 
1.8.1

[Qemu-devel] [PATCH 3/4] configure: silence pkg-config's check for curses

[Stefan Hajnoczi]

From: Vadim Evard <v.e.evard@gmail.com>

Signed-off-by: Vadim Evard <v.e.evard@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 4ebb60d..6211db9 100755
--- a/configure
+++ b/configure
@@ -2039,7 +2039,7 @@ fi
 if test "$mingw32" = "yes" ; then
     curses_list="-lpdcurses"
 else
-    curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)"
+    curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)"
 fi
 
 if test "$curses" != "no" ; then
-- 
1.8.1

[Qemu-devel] [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW)

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

STATUS_TIMEOUT is defined in winnt.h:

  CC    hw/tpci200.o
hw/tpci200.c:34:0:
 warning: "STATUS_TIMEOUT" redefined [enabled by default]
/usr/lib/gcc/x86_64-w64-mingw32/4.6/../../../../x86_64-w64-mingw32/include/winnt.h:1036:0:
 note: this is the location of the previous definition

Use STATUS_TIME instead of STATUS_TIMEOUT as suggested by Alberto Garcia.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/tpci200.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/tpci200.c b/hw/tpci200.c
index e082bca..a4823fb 100644
--- a/hw/tpci200.c
+++ b/hw/tpci200.c
@@ -31,7 +31,7 @@
 #define IP_INT_SPACE_ADDR_MASK 0x3F
 
 #define STATUS_INT(IP, INTNO) BIT((IP) * 2 + (INTNO))
-#define STATUS_TIMEOUT(IP)    BIT((IP) + 12)
+#define STATUS_TIME(IP)       BIT((IP) + 12)
 #define STATUS_ERR_ANY        0xF00
 
 #define CTRL_CLKRATE          BIT(0)
@@ -279,9 +279,9 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,
                     }
                 }
 
-                if (val & STATUS_TIMEOUT(i)) {
+                if (val & STATUS_TIME(i)) {
                     DPRINTF("Clear IP %c timeout\n", 'A' + i);
-                    s->status &= ~STATUS_TIMEOUT(i);
+                    s->status &= ~STATUS_TIME(i);
                 }
             }
 
-- 
1.8.1