@@ -19,6 +19,9 @@
#include "hw/virtio/virtio.h"
#include "qemu/atomic.h"
#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
+
+bool virtio_byteswap;
/*
* The alignment to use between consumer and producer parts of vring.
@@ -546,6 +549,9 @@ void virtio_reset(void *opaque)
virtio_set_status(vdev, 0);
+ /* We assume all devices are the same endian. */
+ virtio_byteswap = virtio_get_byteswap();
+
if (k->reset) {
k->reset(vdev);
}
new file mode 100644
@@ -0,0 +1,134 @@
+/*
+ * Virtio Accessor Support: In case your target can change endian.
+ *
+ * Copyright IBM, Corp. 2013
+ *
+ * Authors:
+ * Rusty Russell <rusty@au.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#ifndef _QEMU_VIRTIO_ACCESS_H
+#define _QEMU_VIRTIO_ACCESS_H
+#include "hw/virtio/virtio.h"
+
+/* Initialized by virtio_get_byteswap() at any virtio device reset. */
+extern bool virtio_byteswap;
+
+static inline uint16_t virtio_lduw_phys(AddressSpace *as, hwaddr pa)
+{
+ if (virtio_byteswap) {
+ return bswap16(lduw_phys(as, pa));
+ }
+ return lduw_phys(as, pa);
+}
+
+static inline uint32_t virtio_ldl_phys(AddressSpace *as, hwaddr pa)
+{
+ if (virtio_byteswap) {
+ return bswap32(ldl_phys(as, pa));
+ }
+ return ldl_phys(as, pa);
+}
+
+static inline uint64_t virtio_ldq_phys(AddressSpace *as, hwaddr pa)
+{
+ if (virtio_byteswap) {
+ return bswap64(ldq_phys(as, pa));
+ }
+ return ldq_phys(as, pa);
+}
+
+static inline void virtio_stw_phys(AddressSpace *as, hwaddr pa, uint16_t value)
+{
+ if (virtio_byteswap) {
+ stw_phys(as, pa, bswap16(value));
+ } else {
+ stw_phys(as, pa, value);
+ }
+}
+
+static inline void virtio_stl_phys(AddressSpace *as, hwaddr pa, uint32_t value)
+{
+ if (virtio_byteswap) {
+ stl_phys(as, pa, bswap32(value));
+ } else {
+ stl_phys(as, pa, value);
+ }
+}
+
+static inline void virtio_stw_p(void *ptr, uint16_t v)
+{
+ if (virtio_byteswap) {
+ stw_p(ptr, bswap16(v));
+ } else {
+ stw_p(ptr, v);
+ }
+}
+
+static inline void virtio_stl_p(void *ptr, uint32_t v)
+{
+ if (virtio_byteswap) {
+ stl_p(ptr, bswap32(v));
+ } else {
+ stl_p(ptr, v);
+ }
+}
+
+static inline void virtio_stq_p(void *ptr, uint64_t v)
+{
+ if (virtio_byteswap) {
+ stq_p(ptr, bswap64(v));
+ } else {
+ stq_p(ptr, v);
+ }
+}
+
+static inline int virtio_lduw_p(const void *ptr)
+{
+ if (virtio_byteswap) {
+ return bswap16(lduw_p(ptr));
+ } else {
+ return lduw_p(ptr);
+ }
+}
+
+static inline int virtio_ldl_p(const void *ptr)
+{
+ if (virtio_byteswap) {
+ return bswap32(ldl_p(ptr));
+ } else {
+ return ldl_p(ptr);
+ }
+}
+
+static inline uint64_t virtio_ldq_p(const void *ptr)
+{
+ if (virtio_byteswap) {
+ return bswap64(ldq_p(ptr));
+ } else {
+ return ldq_p(ptr);
+ }
+}
+
+static inline uint32_t virtio_tswap32(uint32_t s)
+{
+ if (virtio_byteswap) {
+ return bswap32(tswap32(s));
+ } else {
+ return tswap32(s);
+ }
+}
+
+static inline void virtio_tswap32s(uint32_t *s)
+{
+ tswap32s(s);
+ if (virtio_byteswap) {
+ *s = bswap32(*s);
+ }
+}
+#endif /* _QEMU_VIRTIO_ACCESS_H */
@@ -253,4 +253,6 @@ void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,
bool set_handler);
void virtio_queue_notify_vq(VirtQueue *vq);
void virtio_irq(VirtQueue *vq);
+
+extern bool virtio_get_byteswap(void);
#endif
@@ -27,3 +27,4 @@ stub-obj-y += vm-stop.o
stub-obj-y += vmstate.o
stub-obj-$(CONFIG_WIN32) += fd-register.o
stub-obj-y += cpus.o
+stub-obj-y += virtio_get_byteswap.o
new file mode 100644
@@ -0,0 +1,6 @@
+#include "hw/virtio/virtio.h"
+
+bool virtio_get_byteswap(void)
+{
+ return false;
+}