(wip) kd: actually compiles. work moved to qemu-kvm (rhel6)

2 files changed, 7 insertions, 4 deletions

diff --git a/hw/misc/kd.c b/hw/misc/kd.c
index e42a2a011..c03bf6002 100644
--- a/hw/misc/kd.c
+++ b/hw/misc/kd.c
@@ -18,8 +18,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
-#include "config.h"
-#include "qdev.h"
+#include "qemu-common.h"
+#include "qemu-timer.h"
+#include "qemu-queue.h"
+#include "monitor.h"
+#include "sysemu.h"
 #include "isa.h"
 
 /* fixed I/O location */
@@ -59,7 +62,7 @@ static int kd_init(ISADevice *isa)
 }
 
 static ISADeviceInfo kd_info = {
-    .qdev.name = "KD",
+    .qdev.name = "kd",
     .qdev.desc = "Virtual Kernel Debugger",
     .qdev.size = sizeof(KDState),
     .qdev.vmsd = &vmstate_kd,
diff --git a/monitor.c b/monitor.c
index f953fb6b4..bd401720e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3743,7 +3743,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
                 typestr++;
                 if (*p == '\0') {
                     /* missing optional argument: NULL argument */
-                    qemu_free(key);
+                    g_free(key);
                     key = NULL;
                     continue;
                 }