Add shared memory interface to QEMU

diff -r b9f2ce1d04dc -r 0b4c6f94ee52 vl.c
@@ -5221,6 +5221,7 @@
 #endif
            "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
 	   "-vnc display    start a VNC server on display\n"
+	   "-shmem dev      start the shared memory interface on char device 'dev'\n"
            "\n"
            "During emulation, the following keys are useful:\n"
            "ctrl-alt-f      toggle full screen\n"

@@ -5299,6 +5300,7 @@
     QEMU_OPTION_smp,
     QEMU_OPTION_vnc,
     QEMU_OPTION_no_acpi,
+    QEMU_OPTION_shmem,
 };
 
 typedef struct QEMUOption {

@@ -5370,6 +5372,7 @@
     { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
     { "smp", HAS_ARG, QEMU_OPTION_smp },
     { "vnc", HAS_ARG, QEMU_OPTION_vnc },
+    { "shmem", HAS_ARG, QEMU_OPTION_shmem },
     
     /* temporary options */
     { "usb", 0, QEMU_OPTION_usb },

@@ -5604,6 +5607,7 @@
     QEMUMachine *machine;
     char usb_devices[MAX_USB_CMDLINE][128];
     int usb_devices_index;
+    const char *shmem_path = 0;
 
     LIST_INIT (&vm_change_state_head);
 #ifndef _WIN32

@@ -6020,6 +6024,9 @@
             case QEMU_OPTION_no_acpi:
                 acpi_enabled = 0;
                 break;
+	    case QEMU_OPTION_shmem:
+		shmem_path = optarg;
+                break;
             }
         }
     }

@@ -6133,6 +6140,19 @@
         dumb_display_init(ds);
     } else if (vnc_display != -1) {
 	vnc_display_init(ds, vnc_display);
+    } else if (shmem_path) {
+	CharDriverState *s;
+
+	s = qemu_chr_open(shmem_path);
+	if (!s) {
+	    fprintf(stderr, "qemu: could not open shmem device '%s'\n", 
+		    shmem_path);
+	    exit(1);
+	}
+	if (!strcmp(shmem_path, "vc"))
+	    qemu_chr_printf(s, "shmem console\n");
+
+	shmem_display_init(ds, s);
     } else {
 #if defined(CONFIG_SDL)
         sdl_display_init(ds, full_screen);

diff -r b9f2ce1d04dc -r 0b4c6f94ee52 vl.h
@@ -767,6 +767,9 @@
 /* vnc.c */
 void vnc_display_init(DisplayState *ds, int display);
 
+/* shmem.c */
+void shmem_display_init(DisplayState *ds, CharDriverState *s);
+
 /* ide.c */
 #define MAX_DISKS 4
 

249 lines not on this page · raw message

277 lines not on this page · raw message