From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bp4tb-0004aC-Pd for qemu-devel@nongnu.org; Tue, 27 Sep 2016 22:46:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bp4tX-0001Sq-Fn for qemu-devel@nongnu.org; Tue, 27 Sep 2016 22:46:54 -0400 Date: Wed, 28 Sep 2016 12:40:31 +1000 From: David Gibson Message-ID: <20160928024031.GD18880@umbus> References: <1475002559-392-1-git-send-email-lvivier@redhat.com> <1475002559-392-6-git-send-email-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9UV9rz0O2dU/yYYn" Content-Disposition: inline In-Reply-To: <1475002559-392-6-git-send-email-lvivier@redhat.com> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v2 5/6] qtest: define target cpu endianness conversion function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: qemu-devel@nongnu.org, thuth@redhat.com, Greg Kurz , qemu-ppc@nongnu.org, Gerd Hoffmann , dgibson@redhat.com --9UV9rz0O2dU/yYYn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 27, 2016 at 08:55:58PM +0200, Laurent Vivier wrote: > Signed-off-by: Laurent Vivier > --- > tests/libqtest.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 1 file changed, 57 insertions(+) >=20 > diff --git a/tests/libqtest.h b/tests/libqtest.h > index 4be1f77..4c47f2d 100644 > --- a/tests/libqtest.h > +++ b/tests/libqtest.h > @@ -17,6 +17,7 @@ > #ifndef LIBQTEST_H > #define LIBQTEST_H > =20 > +#include "qemu/bswap.h" > #include "qapi/qmp/qdict.h" > =20 > typedef struct QTestState QTestState; > @@ -891,6 +892,62 @@ static inline bool target_big_endian(void) > return qtest_big_endian(global_qtest); > } > =20 > +/* Endianness conversion function between target cpu and specified endia= ness Since the qtest accelerator essentially replaces the target cpu, it's not really clear to me how the (default) endianness of the target cpu comes into play. IIUC for the purposes of the test code you'll eventually want things converted to the *host* endianness - since that's the test code is actually running on. > + * uint16_t target_le16_to_cpu(uint16_t v); > + * uint32_t target_le32_to_cpu(uint32_t v); > + * uint64_t target_le64_to_cpu(uint64_t v); > + * uint16_t target_be16_to_cpu(uint16_t v); > + * uint32_t target_be32_to_cpu(uint32_t v); > + * uint64_t target_be64_to_cpu(uint64_t v); > + * > + * Convert the value @v from the specified format to the native > + * endianness of the host CPU by byteswapping if necessary, and ^^^^^^^^ Should this be target CPU? > + * return the converted value. > + * > + * uint16_t target_cpu_to_le16(uint16_t v); > + * uint32_t target_cpu_to_le32(uint32_t v); > + * uint64_t target_cpu_to_le64(uint64_t v); > + * uint16_t target_cpu_to_be16(uint16_t v); > + * uint32_t target_cpu_to_be32(uint32_t v); > + * uint64_t target_cpu_to_be64(uint64_t v); > + * > + * Convert the value @v from the native endianness of the host CPU to and here ^^^^^^^^ > + * the specified format by byteswapping if necessary, and return > + * the converted value. > + * > + * Both target_X_to_cpu() and target_cpu_to_X() perform the same operati= on; you > + * should use whichever one is better documenting of the function your > + * code is performing. > + * > + */ > + > +#define le_bswap(s, v, size) (qtest_big_endian(s) ? bswap ## size(v) : (= v)) > +#define be_bswap(s, v, size) (qtest_big_endian(s) ? (v) : bswap ## size(= v)) > + > +#define TARGET_CPU_CONVERT(endian, size, type)\ > +static inline type target_ ## endian ## size ## _to_cpu(type v)\ > +{\ > + return glue(endian, _bswap)(global_qtest, v, size);\ > +} \ > +\ > +static inline type target_cpu_to_ ## endian ## size(type v)\ > +{\ > + return glue(endian, _bswap)(global_qtest, v, size);\ > +} > + > +TARGET_CPU_CONVERT(be, 16, uint16_t) > +TARGET_CPU_CONVERT(be, 32, uint32_t) > +TARGET_CPU_CONVERT(be, 64, uint64_t) > + > +TARGET_CPU_CONVERT(le, 16, uint16_t) > +TARGET_CPU_CONVERT(le, 32, uint32_t) > +TARGET_CPU_CONVERT(le, 64, uint64_t) > + > +#undef TARGET_CPU_CONVERT > +#undef be_bswap > +#undef le_bswap > + > QDict *qmp_fd_receive(int fd); > void qmp_fd_sendv(int fd, const char *fmt, va_list ap); > void qmp_fd_send(int fd, const char *fmt, ...); --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --9UV9rz0O2dU/yYYn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX6y2cAAoJEGw4ysog2bOSrswP/3MQYTTqfMQXcIQTr4KCTQcV /4RNJQiZW/DHuTudm+sTY8DZgrtH8zYsdUzJyZ4SWcqWQsQPAsOANpLBjCIFRr9B YJ7jzunRxqP3xU4Za9zf+kyTGh2x9rcM6+7ARvpS5jeVfXd9HGjogezcJ60VS8zD EyZYTnXtlHMjwtDOHONglTRhQ+VRNeqHhEbLKSlu+q2NddHaAJaZa7XA+qh5bvWe Cug8TAgp20G8nWX6qopLDDHDLkM80cIfIj4JOuhRvHvlqLxPfK/Zv7+W6F2nb53b wOHbTIBlLms3KosWNjSHXPzzDrhPzmJQCWbhzmcJinWzMpM8TXq+qagGWHNA5BwY Xnh+1MpQ0iMK13/03d5f6wJK33uuqQpROx7dD8FR2vf63TLs6C6x2c4o2/ViwKHP x0Jzy2SsdYajeIpTAIrLAY7t4QwIgMLIasK1yqdfPZo5rOQwAuywLJwvxtxvpCeJ 3kHcayfOZvsRP6LUz9ckYpXPyy2icdy7uxdwqMWQ9ybBcnBVrzPzFNdXo+ULgZR7 ZPORtLTO/apDJrEx3leyqIG9/W446DH7xqFl6CQMvfd+8JQM71LPSwfWNarbG3sY 7ndqmrioGwP1meMQrbbZeysVdhAZwvR3YL2IbgyF2ZazcRAjLugvqO0kYJCTXUVj Beq7Vyw5incSypNhfBuZ =vawT -----END PGP SIGNATURE----- --9UV9rz0O2dU/yYYn--