[1/2] hw: add isa-debug-exit device v5

Submitted by Lucas Meneghel Rodrigues on Dec. 13, 2012, 5:25 p.m.

Details

Message ID 1355419527-7818-2-git-send-email-lmr@redhat.com
State New
Headers show

Commit Message

Lucas Meneghel Rodrigues Dec. 13, 2012, 5:25 p.m.
From: Gerd Hoffmann <kraxel@redhat.com>

When present it makes qemu exit on any write.
Mapped to port 0x501 by default.

Without this patch Anthony doesn't allow me to
remove the bochs bios debug ports because his
test suite uses this.

Changes from v4:
 * Fixed rebase mistake... again.

Changes from v3:
 * Added a short description
 * Added a copyright notice
 * Added Signed-off-by line to the commit
   message
 * Made the GPL license header to say
   'or any later version', to simplify
   things and be more in line with other
   qemu source files
 * Turned TypeInfo into static const

Changes from v2:
 * Fixed rebase mistake

Changes from v1:
 * Add access_size property to the device,
   needed for kvm-unit-tests.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 hw/debugexit.c        |   87 +++++++++++++++++++++++++++++++++++++++++++++++++
 hw/i386/Makefile.objs |    2 +-
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 hw/debugexit.c

Comments

Andreas Färber Dec. 13, 2012, 5:42 p.m.
Am 13.12.2012 18:25, schrieb Lucas Meneghel Rodrigues:
> From: Gerd Hoffmann <kraxel@redhat.com>
> 
> When present it makes qemu exit on any write.
> Mapped to port 0x501 by default.
> 
> Without this patch Anthony doesn't allow me to
> remove the bochs bios debug ports because his
> test suite uses this.
> 
> Changes from v4:
>  * Fixed rebase mistake... again.
> 
> Changes from v3:
>  * Added a short description
>  * Added a copyright notice
>  * Added Signed-off-by line to the commit
>    message
>  * Made the GPL license header to say
>    'or any later version', to simplify
>    things and be more in line with other
>    qemu source files
>  * Turned TypeInfo into static const
> 
> Changes from v2:
>  * Fixed rebase mistake
> 
> Changes from v1:
>  * Add access_size property to the device,
>    needed for kvm-unit-tests.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>

Thanks,

Reviewed-by: Andreas Färber <afaerber@suse.de>

The change log is getting large and should be dropped from the commit
message when applying (usually goes under --- or in cover letter).

Regards,
Andreas

Patch hide | download patch | download mbox

diff --git a/hw/debugexit.c b/hw/debugexit.c
new file mode 100644
index 0000000..b90983b
--- /dev/null
+++ b/hw/debugexit.c
@@ -0,0 +1,87 @@ 
+/*
+ * QEMU debug exit port ("LGPL'ed-VGA-BIOS-style port 501/502") emulation
+ *
+ * Copyright (c) 2012 Gerd Hoffmann
+ *
+ * (Based on previous work from Herve Poussineau)
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hw.h"
+#include "isa.h"
+
+#define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit"
+#define ISA_DEBUG_EXIT_DEVICE(obj) \
+     OBJECT_CHECK(ISADebugExitState, (obj), TYPE_ISA_DEBUG_EXIT_DEVICE)
+
+typedef struct ISADebugExitState {
+    ISADevice parent_obj;
+
+    uint32_t iobase;
+    uint8_t access_size;
+    MemoryRegion io;
+} ISADebugExitState;
+
+static void debug_exit_write(void *opaque, hwaddr addr, uint64_t val,
+                             unsigned width)
+{
+    exit((val << 1) | 1);
+}
+
+static const MemoryRegionOps debug_exit_ops = {
+    .write = debug_exit_write,
+    .valid.min_access_size = 1,
+    .valid.max_access_size = 1,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+static int debug_exit_initfn(ISADevice *dev)
+{
+    ISADebugExitState *isa = ISA_DEBUG_EXIT_DEVICE(dev);
+
+    memory_region_init_io(&isa->io, &debug_exit_ops, isa,
+                          TYPE_ISA_DEBUG_EXIT_DEVICE, isa->access_size);
+    memory_region_add_subregion(isa_address_space_io(dev),
+                                isa->iobase, &isa->io);
+    return 0;
+}
+
+static Property debug_exit_properties[] = {
+    DEFINE_PROP_HEX32("iobase", ISADebugExitState, iobase, 0x501),
+    DEFINE_PROP_UINT8("access-size", ISADebugExitState, access_size, 1),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void debug_exit_class_initfn(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
+    ic->init = debug_exit_initfn;
+    dc->props = debug_exit_properties;
+}
+
+static const TypeInfo debug_exit_info = {
+    .name          = TYPE_ISA_DEBUG_EXIT_DEVICE,
+    .parent        = TYPE_ISA_DEVICE,
+    .instance_size = sizeof(ISADebugExitState),
+    .class_init    = debug_exit_class_initfn,
+};
+
+static void debug_exit_register_types(void)
+{
+    type_register_static(&debug_exit_info);
+}
+
+type_init(debug_exit_register_types)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 0d3f6a8..56aaa9d 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -3,7 +3,7 @@  obj-y += apic_common.o apic.o kvmvapic.o
 obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
 obj-y += vmport.o
 obj-y += pci-hotplug.o smbios.o wdt_ib700.o
-obj-y += debugcon.o multiboot.o
+obj-y += debugcon.o debugexit.o multiboot.o
 obj-y += pc_piix.o
 obj-y += pc_sysfw.o
 obj-y += lpc_ich9.o q35.o pc_q35.o