summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2014-07-31 11:01:50 +0300
committerAlon Levy <alevy@redhat.com>2014-07-31 11:01:50 +0300
commit23e110788f67b8611c79fc2bfbcc9945d2ad3e08 (patch)
treeb82e2102371533865878214e32ab568716719da6
parent958d501f63af59738630d799ed39d4f3adda912a (diff)
wip-kd 3 year upgradekd
-rw-r--r--hw/misc/kd.c20
m---------roms/SLOF0
m---------roms/ipxe0
m---------roms/openbios0
m---------roms/seabios0
5 files changed, 15 insertions, 5 deletions
diff --git a/hw/misc/kd.c b/hw/misc/kd.c
index c03bf6002..49a346bf8 100644
--- a/hw/misc/kd.c
+++ b/hw/misc/kd.c
@@ -19,11 +19,11 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
-#include "qemu-queue.h"
-#include "monitor.h"
-#include "sysemu.h"
-#include "isa.h"
+#include "qemu/timer.h"
+#include "qemu/queue.h"
+#include "monitor/monitor.h"
+//#include "sysemu.h"
+#include "hw/isa/isa.h"
/* fixed I/O location */
#define KD_IOPORT 0x5659
@@ -53,10 +53,20 @@ const VMStateDescription vmstate_kd = {
}
};
+static const MemoryRegionOps kd_ops = {
+ .write = kd_ioport_write,
+ .endianess = DEVICE_NATIVE_ENDIAN,
+ .impl = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+};
+
static int kd_init(ISADevice *isa)
{
KDState *kd = DO_UPCAST(KDState, dev, isa);
+ memory_region_init_io(, &kd_ops, );
+ memory_region_add_subregion();
register_ioport_write(KD_IOPORT, 1, 4, kd_ioport_write, kd);
return 0;
}
diff --git a/roms/SLOF b/roms/SLOF
-Subproject f284ab3f03ae69a20e1ae966f6ddf76da33cbf7
+Subproject e2e8ac901e617573ea383f9cffd136146d0675a
diff --git a/roms/ipxe b/roms/ipxe
-Subproject 69313edad85f8958acc8a47272b3c3da494835e
+Subproject 09c5109b8585178172c7608de8d52e9d9af0b68
diff --git a/roms/openbios b/roms/openbios
-Subproject a056ccbebaa802b22bed59e2e07ea78f256243c
+Subproject 888126272f92294b0da45158393f1b862742cf6
diff --git a/roms/seabios b/roms/seabios
-Subproject e51488c5f8800a52ac5c8da7a31b85cca5cc95d
+Subproject 96917a8ed761f017fc8c72ba3b9181fbac03ac5