On 3/30/13, Pinter Oliver ICTF <o...@crysys.hu> wrote:
> CC other mail address
>
> On Sat, Mar 30, 2013 at 01:20:00AM +0000, freebsd-gnats-sub...@freebsd.org
> wrote:
>> Thank you very much for your problem report.
>> It has the internal identification `ports/177488'.
>> The individual assigned to look at your
>> report is: freebsd-ports-bugs.
>>
>> You can access the state of your problem report at any time
>> via this link:
>>
>> http://www.freebsd.org/cgi/query-pr.cgi?pr=177488
>>
>> >Category: ports
>> >Responsible: freebsd-ports-bugs
>> >Synopsis: qemu-1.4
>> >Arrival-Date: Sat Mar 30 01:20:00 UTC 2013
>>
disable some unneeded function, and make qemu 1.4 compilable on FreeBSD 9.1
>
From 579cf589ca45e6fd7e15d7c214dfa63b57ae4163 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.p...@gmail.com>
Date: Sat, 30 Mar 2013 01:06:48 +0100
Subject: [PATCH 1/4] fix this error:
In file included from qemu-char.c:59:
/usr/include/libutil.h:98:6: error: conflicting types for 'hexdump'
void hexdump(const void *_ptr, int _length, const char *_hdr, int
_flags);
^
/tmp/qemu/include/qemu-common.h:449:6: note: previous
declaration is here
void hexdump(const char *buf, FILE *fp, const char *prefix,
size_t size);
^
1 error generated.
gmake: *** [qemu-char.o] Error 1
Signed-off-by: Oliver Pinter <oliver.p...@gmail.com>
---
hw/pl330.c | 4 ++--
include/qemu-common.h | 2 +-
util/hexdump.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/pl330.c b/hw/pl330.c
index 1a04773..ac661eb 100644
--- a/hw/pl330.c
+++ b/hw/pl330.c
@@ -1158,7 +1158,7 @@ static int pl330_exec_cycle(PL330Chan *channel)
if (PL330_ERR_DEBUG > 1) {
DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
q->addr, len);
- hexdump((char *)buf, stderr, "", len);
+ qemu_hexdump((char *)buf, stderr, "", len);
}
fifo_res = pl330_fifo_push(&s->fifo, buf, len, q->tag);
if (fifo_res == PL330_FIFO_OK) {
@@ -1190,7 +1190,7 @@ static int pl330_exec_cycle(PL330Chan *channel)
if (PL330_ERR_DEBUG > 1) {
DB_PRINT("PL330 read from memory @%08x (size = %08x):\n",
q->addr, len);
- hexdump((char *)buf, stderr, "", len);
+ qemu_hexdump((char *)buf, stderr, "", len);
}
if (q->inc) {
q->addr += len;
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 31fff22..e3cad8a 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -446,7 +446,7 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n);
* Hexdump a buffer to a file. An optional string prefix is added to every line
*/
-void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
+void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
/* vector definitions */
#ifdef __ALTIVEC__
diff --git a/util/hexdump.c b/util/hexdump.c
index 0d0efc8..969b340 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
-void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
+void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
{
unsigned int b;
--
1.8.2
From 27810afb999c9acb6dc81f0e9490fd69dd378251 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.p...@gmail.com>
Date: Sat, 30 Mar 2013 01:11:58 +0100
Subject: [PATCH 2/4] removed usb-redir support, while it is broken ...
Signed-off-by: Oliver Pinter <oliver.p...@gmail.com>
---
configure | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure b/configure
index f2af714..ba40756 100755
--- a/configure
+++ b/configure
@@ -540,7 +540,6 @@ esac
if [ "$bsd" = "yes" ] ; then
if [ "$darwin" != "yes" ] ; then
- usb="bsd"
bsd_user="yes"
fi
fi
--
1.8.2
From f2d4bbc618bd6aacd6926dd059a2a7ee649d4ff8 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.p...@gmail.com>
Date: Sat, 30 Mar 2013 01:38:53 +0100
Subject: [PATCH 3/4] fix round_page redefinition
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected identifier or '('
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:27: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')'
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:27: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '('
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:26: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')'
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:46: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '('
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:24: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')'
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:59: note: expanded from macro 'round_page'
^
/tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '('
static hwaddr round_page(hwaddr addr)
^
/usr/include/machine/param.h:128:23: note: expanded from macro 'round_page'
^
4 errors generated.
gmake[1]: *** [hw/ppc/mac_oldworld.o] Error 1
gmake: *** [subdir-ppc-softmmu] Error 2
---
hw/ppc/mac_newworld.c | 4 ++++
hw/ppc/mac_oldworld.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index a08a6b2..7df4622 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -82,6 +82,10 @@
#define UNIN_DPRINTF(fmt, ...)
#endif
+#ifdef __FreeBSD__
+#undef round_page
+#endif // __FreeBSD__
+
/* UniN device */
static void unin_write(void *opaque, hwaddr addr, uint64_t value,
unsigned size)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 2778e45..9a83290 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -43,6 +43,10 @@
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
+#ifdef __FreeBSD__
+#undef round_page
+#endif // __FreeBSD__
+
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
--
1.8.2
From e6ae2efe1e8e8d0706a4cac215dde2b8625ca062 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.p...@gmail.com>
Date: Sat, 30 Mar 2013 01:46:04 +0100
Subject: [PATCH 4/4] fix CTLTYPE_QUAD related compile error
Signed-off-by: Oliver Pinter <oliver.p...@gmail.com>
---
bsd-user/syscall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c
index 18b43f1..156ebc6 100644
--- a/bsd-user/syscall.c
+++ b/bsd-user/syscall.c
@@ -36,6 +36,8 @@
#include "qemu.h"
#include "qemu-common.h"
+#define CTLTYPE_QUAD CTLTYPE_U64
+
//#define DEBUG
static abi_ulong target_brk;
--
1.8.2
From 91ec9e4bbecfb641eff2cbd05ec4bc7026f6c4af Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.p...@gmail.com>
Date: Sat, 30 Mar 2013 02:10:22 +0100
Subject: [PATCH 5/5] disable bsd-user
Signed-off-by: Oliver Pinter <oliver.p...@gmail.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index ba40756..3bf2871 100755
--- a/configure
+++ b/configure
@@ -540,7 +540,7 @@ esac
if [ "$bsd" = "yes" ] ; then
if [ "$darwin" != "yes" ] ; then
- bsd_user="yes"
+ # nothing
fi
fi
--
1.8.2
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
