Re: ports/177488: qemu-1.4
2013-03-30 10:23, Juergen Lock wrote: disable some unneeded function, and make qemu 1.4 compilable on FreeBSD 9.1 I think you are building qemu git head as the hexdump function at least isn't in 1.4.0? Anyway I have meanwhile updated the qemu-devel port to 1.4.0 with some similar patches to yours and (among other things) preliminary bsd-user improvements mostly by ssson and cognet, will leave the PR open for when I need the hexdump patch for a future update. Doesn't build WITHOUT_CURL: block/qcow.o: In function `encrypt_sectors': /tmp/ports/usr/ports/emulators/qemu-devel/work/qemu-1.4.0/block/qcow.c:250: undefined reference to `AES_cbc_encrypt' block/qcow2-cluster.o: In function `qcow2_encrypt_sectors': /tmp/ports/usr/ports/emulators/qemu-devel/work/qemu-1.4.0/block/qcow2-cluster.c:309: undefined reference to `AES_cbc_encrypt' gmake: *** [qemu-nbd] Помилка 1 gmake: *** Очікування завершення завдань... block/qcow.o: In function `encrypt_sectors': /tmp/ports/usr/ports/emulators/qemu-devel/work/qemu-1.4.0/block/qcow.c:250: undefined reference to `AES_cbc_encrypt' block/qcow2-cluster.o: In function `qcow2_encrypt_sectors': /tmp/ports/usr/ports/emulators/qemu-devel/work/qemu-1.4.0/block/qcow2-cluster.c:309: undefined reference to `AES_cbc_encrypt' -- Sphinx of black quartz, judge my vow. ___ 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
Re: ports/177488: qemu-1.4
On Mon, Apr 01, 2013 at 03:20:25PM +0300, Volodymyr Kostyrko wrote: [...] Doesn't build WITHOUT_CURL: block/qcow.o: In function `encrypt_sectors': /tmp/ports/usr/ports/emulators/qemu-devel/work/qemu-1.4.0/block/qcow.c:250: undefined reference to `AES_cbc_encrypt' [...] Thanx, looks like --disable-curl is now broken upstream so I removed the knob. Juergen ___ 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
Re: ports/177488: qemu-1.4
On Sat, Mar 30, 2013 at 02:36:35AM +0100, Oliver Pinter wrote: [..] disable some unneeded function, and make qemu 1.4 compilable on FreeBSD 9.1 I think you are building qemu git head as the hexdump function at least isn't in 1.4.0? Anyway I have meanwhile updated the qemu-devel port to 1.4.0 with some similar patches to yours and (among other things) preliminary bsd-user improvements mostly by ssson and cognet, will leave the PR open for when I need the hexdump patch for a future update. Thanx, Juergen ___ 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
Re: ports/177488: qemu-1.4
yes this is git head, sorry On 3/30/13, Juergen Lock n...@jelal.kn-bremen.de wrote: On Sat, Mar 30, 2013 at 02:36:35AM +0100, Oliver Pinter wrote: [..] disable some unneeded function, and make qemu 1.4 compilable on FreeBSD 9.1 I think you are building qemu git head as the hexdump function at least isn't in 1.4.0? Anyway I have meanwhile updated the qemu-devel port to 1.4.0 with some similar patches to yours and (among other things) preliminary bsd-user improvements mostly by ssson and cognet, will leave the PR open for when I need the hexdump patch for a future update. Thanx, Juergen ___ 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
Re: ports/177488: qemu-1.4
and one more On 3/30/13, Oliver Pinter oliver.p...@gmail.com wrote: yes this is git head, sorry On 3/30/13, Juergen Lock n...@jelal.kn-bremen.de wrote: On Sat, Mar 30, 2013 at 02:36:35AM +0100, Oliver Pinter wrote: [..] disable some unneeded function, and make qemu 1.4 compilable on FreeBSD 9.1 I think you are building qemu git head as the hexdump function at least isn't in 1.4.0? Anyway I have meanwhile updated the qemu-devel port to 1.4.0 with some similar patches to yours and (among other things) preliminary bsd-user improvements mostly by ssson and cognet, will leave the PR open for when I need the hexdump patch for a future update. Thanx, Juergen commit 5d6a1ccd8cd97a0708aabcfb5088b44c6ae5395d Author: Oliver Pinter oliver.p...@gmail.com Date: Sat Mar 30 18:24:02 2013 +0100 one more hexdump fix Signed-off-by: Oliver Pinter oliver.p...@gmail.com diff --git a/util/iov.c b/util/iov.c index 9dae318..bab3998 100644 --- a/util/iov.c +++ b/util/iov.c @@ -211,7 +211,7 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt, size = size limit ? limit : size; buf = g_malloc(size); iov_to_buf(iov, iov_cnt, 0, buf, size); -hexdump(buf, fp, prefix, size); +qemu_hexdump(buf, fp, prefix, size); g_free(buf); } ___ 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
Re: ports/177488: qemu-1.4
On 3/30/13, Pinter Oliver ICTF o...@crysys.hu wrote:
CC other mail address
On Sat, Mar 30, 2013 at 01:20:00AM +, 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'
voidhexdump(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'
