Commit 9807cacc authored by Blue Swirl's avatar Blue Swirl
Browse files

virtio-pci: replace byte swap hack 



Remove byte swaps by declaring the config space
as native endian.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 1d728c39

exec.c

+0 −18
Original line number Diff line number Diff line
@@ -2587,24 +2587,6 @@ int cpu_memory_rw_debug(CPUArchState *env, target_ulong addr, 
}

#endif



#if !defined(CONFIG_USER_ONLY)



/*

 * A helper function for the _utterly broken_ virtio device model to find out if

 * it's running on a big endian machine. Don't do this at home kids!

 */

bool virtio_is_big_endian(void);

bool virtio_is_big_endian(void)

{

#if defined(TARGET_WORDS_BIGENDIAN)

    return true;

#else

    return false;

#endif

}



#endif



#ifndef CONFIG_USER_ONLY

bool cpu_physical_memory_is_io(hwaddr phys_addr)

{

hw/virtio-pci.c

+1 −16
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ 
 */

#define wmb() do { } while (0)



/* HACK for virtio to determine if it's running a big endian guest */

bool virtio_is_big_endian(void);



/* virtio device */

/* DeviceState to VirtIOPCIProxy. For use off data-path. TODO: use QOM. */

static inline VirtIOPCIProxy *to_virtio_pci_proxy(DeviceState *d)
@@ -403,15 +400,9 @@ static uint64_t virtio_pci_config_read(void *opaque, hwaddr addr, 
        break;

    case 2:

        val = virtio_config_readw(proxy->vdev, addr);

        if (virtio_is_big_endian()) {

            val = bswap16(val);

        }

        break;

    case 4:

        val = virtio_config_readl(proxy->vdev, addr);

        if (virtio_is_big_endian()) {

            val = bswap32(val);

        }

        break;

    }

    return val;
@@ -436,15 +427,9 @@ static void virtio_pci_config_write(void *opaque, hwaddr addr, 
        virtio_config_writeb(proxy->vdev, addr, val);

        break;

    case 2:

        if (virtio_is_big_endian()) {

            val = bswap16(val);

        }

        virtio_config_writew(proxy->vdev, addr, val);

        break;

    case 4:

        if (virtio_is_big_endian()) {

            val = bswap32(val);

        }

        virtio_config_writel(proxy->vdev, addr, val);

        break;

    }
@@ -457,7 +442,7 @@ static const MemoryRegionOps virtio_pci_config_ops = { 
        .min_access_size = 1,

        .max_access_size = 4,

    },

    .endianness = DEVICE_LITTLE_ENDIAN,

    .endianness = DEVICE_NATIVE_ENDIAN,

};



static void virtio_write_config(PCIDevice *pci_dev, uint32_t address,