Patchwork [2/2] hw: Add test device for unittests execution v7

login
register
mail settings
Submitter Lucas Meneghel Rodrigues
Date Dec. 13, 2012, 5:10 p.m.
Message ID <1355418627-7105-3-git-send-email-lmr@redhat.com>
Download mbox | patch
Permalink /patch/206181/
State New
Headers show

Comments

Lucas Meneghel Rodrigues - Dec. 13, 2012, 5:10 p.m.
Add a test device which supports the kvmctl ioports,
so one can run the KVM unittest suite.

Intended Usage:

qemu-system-x86_64\
-device pc-testdev -serial stdio \
-device isa-debugexit,iobase=0xf4,access-size=4 \
-kernel /path/to/kvm/unittests/msr.flat

Where msr.flat is one of the KVM unittests, present on a
separate repo,

git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git

Changes from v6:
* Only use sys/mman.h and mprotect on non windows
  platforms

Changes from v5:
* Fixed rebase mistake

Changes from v4:
* Pass iomem_buf as an opaque, as requested by Blue
* Ported to new MMIO schema, as requested by Jan

Changes from v3:
* Ported all register_ioport functions to memory API

Changes from v2:

* Rename struct testdev to PCTestdev
* Embed ioport_data into PCTestdev struct
* Porting most register_ioport functions to memory API

Changes from v1:

* Removed unused testdev member
* Renamed device to a less generic name, pc-testdev

Initial changes from initial attempt:

* Removed port 0xf1, since now kvm-unit-tests use
  serial
* Removed exit code port 0xf4, since that can be
  replaced by

-device isa-debugexit,iobase=0xf4,access-size=4

* Removed ram size port 0xd1, since guest memory
  size can be retrieved from firmware, there's a
  patch for kvm-unit-tests including an API to
  retrieve that value.

CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 hw/i386/Makefile.objs |    1 +
 hw/pc-testdev.c       |    5 +++++
 2 files changed, 6 insertions(+)

Patch

diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 56aaa9d..1ac5fc5 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -12,5 +12,6 @@  obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
 obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o
 obj-y += kvm/
 obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
+obj-y += pc-testdev.o
 
 obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c
index 06cf872..1bea8ea 100644
--- a/hw/pc-testdev.c
+++ b/hw/pc-testdev.c
@@ -35,7 +35,10 @@ 
  * git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git
  */
 
+#ifndef _WIN32
 #include <sys/mman.h>
+#endif
+
 #include "hw.h"
 #include "qdev.h"
 #include "isa.h"
@@ -77,10 +80,12 @@  static void test_device_flush_page(void *opaque, uint32_t addr, uint32_t data)
     hwaddr len = 4096;
     void *a = cpu_physical_memory_map(data & ~0xffful, &len, 0);
 
+#ifndef _WIN32
     /* We might not be able to get the full page, only mprotect what we actually
        have mapped */
     mprotect(a, len, PROT_NONE);
     mprotect(a, len, PROT_READ|PROT_WRITE);
+#endif
     cpu_physical_memory_unmap(a, len, 0, 0);
 }