From: Lucas Meneghel Rodrigues <lmr@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, aliguori@us.ibm.com, Lucas Meneghel Rodrigues <lmr@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com> Subject: [PATCH] hw: Add test device for unittests execution v2 Date: Wed, 31 Aug 2011 18:06:09 -0300 [thread overview] Message-ID: <1314824769-27740-1-git-send-email-lmr@redhat.com> (raw) Add a test device which supports the kvmctl ioports, for running the KVM test suite. Usage: qemu -chardev file,path=/log/file/some/where,id=testlog -device pc-testdev,chardev=testlog lmr: I've tried to address the comments made by the reviewers, but I probably left out some things. Please let me know whether this is on the right track. Thanks to Marcelo for helping me with questions about the new memory API. Changes from v1: * Updated description * Used the API fw_cfg to retrieve device ram size in k-u-t.git (see * separate patch) * Use getpagesize() to retrieve page size instead of hard coding it * Dropped functions to write to a serial device * Updated struct name to be TestDev to comply with CODING_STYLE * Now device is called pc-testdev rather than testdev * Conversion to MemoryRegion Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> --- Makefile.target | 1 + hw/pc-testdev.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 hw/pc-testdev.c diff --git a/Makefile.target b/Makefile.target index 07af4d4..450fc18 100644 --- a/Makefile.target +++ b/Makefile.target @@ -232,6 +232,7 @@ obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o obj-i386-$(CONFIG_KVM) += kvmclock.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o +obj-i386-y += pc-testdev.o # shared objects obj-ppc-y = ppc.o diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c new file mode 100644 index 0000000..0b6dd96 --- /dev/null +++ b/hw/pc-testdev.c @@ -0,0 +1,121 @@ +#include <sys/mman.h> +#include "hw.h" +#include "qdev.h" +#include "isa.h" +#include "fw_cfg.h" +#include "exec-memory.h" + +struct TestDev { + ISADevice dev; + CharDriverState *chr; + MemoryRegion mem; +}; + +static void test_device_exit(void *opaque, uint32_t addr, uint32_t data) +{ + exit(data); +} + +static void test_device_irq_line(void *opaque, uint32_t addr, uint32_t data) +{ + qemu_set_irq(isa_get_irq(addr - 0x2000), !!data); +} + +static uint32 test_device_ioport_data; + +static void test_device_ioport_write(void *opaque, uint32_t addr, uint32_t data) +{ + test_device_ioport_data = data; +} + +static uint32_t test_device_ioport_read(void *opaque, uint32_t addr) +{ + return test_device_ioport_data; +} + +static void test_device_flush_page(void *opaque, uint32_t addr, uint32_t data) +{ + target_phys_addr_t len = getpagesize(); + void *a = cpu_physical_memory_map(data & ~0xffful, &len, 0); + + mprotect(a, 4096, PROT_NONE); + mprotect(a, 4096, PROT_READ|PROT_WRITE); + cpu_physical_memory_unmap(a, len, 0, 0); +} + +static char *iomem_buf; + +static uint32_t test_iomem_readb(void *opaque, target_phys_addr_t addr) +{ + return iomem_buf[addr]; +} + +static uint32_t test_iomem_readw(void *opaque, target_phys_addr_t addr) +{ + return *(uint16_t*)(iomem_buf + addr); +} + +static uint32_t test_iomem_readl(void *opaque, target_phys_addr_t addr) +{ + return *(uint32_t*)(iomem_buf + addr); +} + +static void test_iomem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + iomem_buf[addr] = val; +} + +static void test_iomem_writew(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + *(uint16_t*)(iomem_buf + addr) = val; +} + +static void test_iomem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + *(uint32_t*)(iomem_buf + addr) = val; +} + +static const MemoryRegionOps test_mem_ops = { + .old_mmio = { + .read = { test_iomem_readb, test_iomem_readw, test_iomem_readl }, + .write = { test_iomem_writeb, test_iomem_writew, test_iomem_writel }, + }, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + + +static int init_test_device(ISADevice *isa) +{ + struct TestDev *dev = DO_UPCAST(struct TestDev, dev, isa); + + register_ioport_write(0xf4, 1, 4, test_device_exit, dev); + register_ioport_read(0xe0, 1, 1, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 1, test_device_ioport_write, dev); + register_ioport_read(0xe0, 1, 2, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 2, test_device_ioport_write, dev); + register_ioport_read(0xe0, 1, 4, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 4, test_device_ioport_write, dev); + register_ioport_write(0xe4, 1, 4, test_device_flush_page, dev); + register_ioport_write(0x2000, 24, 1, test_device_irq_line, NULL); + iomem_buf = g_malloc0(0x10000); + memory_region_init_io(&dev->mem, &test_mem_ops, NULL, "testdev", 0x10000); + memory_region_add_subregion(get_system_memory(), 0xff000000, &dev->mem); + return 0; +} + +static ISADeviceInfo testdev_info = { + .qdev.name = "testdev", + .qdev.size = sizeof(struct TestDev), + .init = init_test_device, + .qdev.props = (Property[]) { + DEFINE_PROP_CHR("chardev", struct TestDev, chr), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void testdev_register_devices(void) +{ + isa_qdev_register(&testdev_info); +} + +device_init(testdev_register_devices) -- 1.7.6
WARNING: multiple messages have this Message-ID (diff)
From: Lucas Meneghel Rodrigues <lmr@redhat.com> To: qemu-devel@nongnu.org Cc: Lucas Meneghel Rodrigues <lmr@redhat.com>, aliguori@us.ibm.com, kvm@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Avi Kivity <avi@redhat.com> Subject: [Qemu-devel] [PATCH] hw: Add test device for unittests execution v2 Date: Wed, 31 Aug 2011 18:06:09 -0300 [thread overview] Message-ID: <1314824769-27740-1-git-send-email-lmr@redhat.com> (raw) Add a test device which supports the kvmctl ioports, for running the KVM test suite. Usage: qemu -chardev file,path=/log/file/some/where,id=testlog -device pc-testdev,chardev=testlog lmr: I've tried to address the comments made by the reviewers, but I probably left out some things. Please let me know whether this is on the right track. Thanks to Marcelo for helping me with questions about the new memory API. Changes from v1: * Updated description * Used the API fw_cfg to retrieve device ram size in k-u-t.git (see * separate patch) * Use getpagesize() to retrieve page size instead of hard coding it * Dropped functions to write to a serial device * Updated struct name to be TestDev to comply with CODING_STYLE * Now device is called pc-testdev rather than testdev * Conversion to MemoryRegion Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> --- Makefile.target | 1 + hw/pc-testdev.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 hw/pc-testdev.c diff --git a/Makefile.target b/Makefile.target index 07af4d4..450fc18 100644 --- a/Makefile.target +++ b/Makefile.target @@ -232,6 +232,7 @@ obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o obj-i386-$(CONFIG_KVM) += kvmclock.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o +obj-i386-y += pc-testdev.o # shared objects obj-ppc-y = ppc.o diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c new file mode 100644 index 0000000..0b6dd96 --- /dev/null +++ b/hw/pc-testdev.c @@ -0,0 +1,121 @@ +#include <sys/mman.h> +#include "hw.h" +#include "qdev.h" +#include "isa.h" +#include "fw_cfg.h" +#include "exec-memory.h" + +struct TestDev { + ISADevice dev; + CharDriverState *chr; + MemoryRegion mem; +}; + +static void test_device_exit(void *opaque, uint32_t addr, uint32_t data) +{ + exit(data); +} + +static void test_device_irq_line(void *opaque, uint32_t addr, uint32_t data) +{ + qemu_set_irq(isa_get_irq(addr - 0x2000), !!data); +} + +static uint32 test_device_ioport_data; + +static void test_device_ioport_write(void *opaque, uint32_t addr, uint32_t data) +{ + test_device_ioport_data = data; +} + +static uint32_t test_device_ioport_read(void *opaque, uint32_t addr) +{ + return test_device_ioport_data; +} + +static void test_device_flush_page(void *opaque, uint32_t addr, uint32_t data) +{ + target_phys_addr_t len = getpagesize(); + void *a = cpu_physical_memory_map(data & ~0xffful, &len, 0); + + mprotect(a, 4096, PROT_NONE); + mprotect(a, 4096, PROT_READ|PROT_WRITE); + cpu_physical_memory_unmap(a, len, 0, 0); +} + +static char *iomem_buf; + +static uint32_t test_iomem_readb(void *opaque, target_phys_addr_t addr) +{ + return iomem_buf[addr]; +} + +static uint32_t test_iomem_readw(void *opaque, target_phys_addr_t addr) +{ + return *(uint16_t*)(iomem_buf + addr); +} + +static uint32_t test_iomem_readl(void *opaque, target_phys_addr_t addr) +{ + return *(uint32_t*)(iomem_buf + addr); +} + +static void test_iomem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + iomem_buf[addr] = val; +} + +static void test_iomem_writew(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + *(uint16_t*)(iomem_buf + addr) = val; +} + +static void test_iomem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + *(uint32_t*)(iomem_buf + addr) = val; +} + +static const MemoryRegionOps test_mem_ops = { + .old_mmio = { + .read = { test_iomem_readb, test_iomem_readw, test_iomem_readl }, + .write = { test_iomem_writeb, test_iomem_writew, test_iomem_writel }, + }, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + + +static int init_test_device(ISADevice *isa) +{ + struct TestDev *dev = DO_UPCAST(struct TestDev, dev, isa); + + register_ioport_write(0xf4, 1, 4, test_device_exit, dev); + register_ioport_read(0xe0, 1, 1, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 1, test_device_ioport_write, dev); + register_ioport_read(0xe0, 1, 2, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 2, test_device_ioport_write, dev); + register_ioport_read(0xe0, 1, 4, test_device_ioport_read, dev); + register_ioport_write(0xe0, 1, 4, test_device_ioport_write, dev); + register_ioport_write(0xe4, 1, 4, test_device_flush_page, dev); + register_ioport_write(0x2000, 24, 1, test_device_irq_line, NULL); + iomem_buf = g_malloc0(0x10000); + memory_region_init_io(&dev->mem, &test_mem_ops, NULL, "testdev", 0x10000); + memory_region_add_subregion(get_system_memory(), 0xff000000, &dev->mem); + return 0; +} + +static ISADeviceInfo testdev_info = { + .qdev.name = "testdev", + .qdev.size = sizeof(struct TestDev), + .init = init_test_device, + .qdev.props = (Property[]) { + DEFINE_PROP_CHR("chardev", struct TestDev, chr), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void testdev_register_devices(void) +{ + isa_qdev_register(&testdev_info); +} + +device_init(testdev_register_devices) -- 1.7.6
next reply other threads:[~2011-08-31 21:06 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-31 21:06 Lucas Meneghel Rodrigues [this message] 2011-08-31 21:06 ` [Qemu-devel] [PATCH] hw: Add test device for unittests execution v2 Lucas Meneghel Rodrigues 2011-08-31 21:13 ` Edgar E. Iglesias 2011-08-31 21:13 ` Edgar E. Iglesias 2011-09-01 7:22 ` Jan Kiszka 2011-09-01 7:22 ` [Qemu-devel] " Jan Kiszka 2011-09-01 9:44 ` Paolo Bonzini 2011-09-01 9:44 ` [Qemu-devel] " Paolo Bonzini
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1314824769-27740-1-git-send-email-lmr@redhat.com \ --to=lmr@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=avi@redhat.com \ --cc=kraxel@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.