xephyr: aid input debugging

Add the 'ephyr' mouse and keyboard drivers to the driver list so we can
re-add devices.
Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.

2 files changed, 4 insertions, 2 deletions

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index d3c9bf9d4..7db8675d8 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -865,6 +865,7 @@ MouseInit (KdPointerInfo *pi)
     ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
     pi->nAxes = 3;
     pi->nButtons = 32;
+    pi->name = KdSaveString("Xephyr virtual mouse");
     ephyrMouse = pi;
     return Success;
 }
@@ -917,6 +918,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki)
   ki->maxScanCode = ki->keySyms.maxKeyCode;
   ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
   ki->keySyms.map = ephyrKeySyms.map;
+  ki->name = KdSaveString("Xephyr virtual keyboard");
   ephyrKbd = ki;
   return Success;
 }
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 021abd65f..a77b87e5e 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -58,14 +58,14 @@ InitInput (int argc, char **argv)
   if (!ki)
     FatalError("Couldn't create Xephyr keyboard\n");
   ki->driver = &EphyrKeyboardDriver;
-  ki->name = KdSaveString("Xephyr virtual keyboard");
+  KdAddKeyboardDriver(&EphyrKeyboardDriver);
   KdAddKeyboard(ki);
 
   pi = KdNewPointer();
   if (!pi)
     FatalError("Couldn't create Xephyr pointer\n");
   pi->driver = &EphyrMouseDriver;
-  pi->name = KdSaveString("Xephyr virtual mouse");
+  KdAddPointerDriver(&EphyrMouseDriver);
   KdAddPointer(pi);
 
   KdInitInput();