From d0f54533eb484028f54d3f9810d504cb63f323ee Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 16 Jan 2013 18:40:29 +0100 Subject: [PATCH 1/4] hw: Spelling fix in log message defineition -> definition Signed-off-by: Stefan Weil Reviewed-by: Andreas F=E4rber Signed-off-by: Stefan Hajnoczi --- 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 fb47cdc82d..6c443ba804 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); From 5facfb4934221cac2c267e529d7ebab165103bc9 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 17 Jan 2013 14:53:52 +0400 Subject: [PATCH 2/4] acpitable: open the data file in binary mode -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 Signed-off-by: Stefan Hajnoczi --- hw/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi.c b/hw/acpi.c index 97617c4ef5..8c9dcc51c4 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)); From acf15c8949f125a4d4f958a5134f8eeece1f99f5 Mon Sep 17 00:00:00 2001 From: Vadim Evard Date: Fri, 18 Jan 2013 17:48:04 +0400 Subject: [PATCH 3/4] configure: silence pkg-config's check for curses Signed-off-by: Vadim Evard Signed-off-by: Stefan Hajnoczi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4ebb60dedc..6211db9553 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 From 09a021fb7ceb7255ab106999d7b38ffd92c3bdd6 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 21 Jan 2013 07:49:51 +0100 Subject: [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW) 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 Signed-off-by: Stefan Hajnoczi --- hw/tpci200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/tpci200.c b/hw/tpci200.c index e082bca965..a4823fb9f2 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); } }