- Add the option vga-passthrough and dom0-input.

diff --git a/vl.c b/vl.c
index 182346af469228e9e67b6adf0f422a8f34b6e33d..3cef757ad19e6cdcb44a08c38a3b534b38c0b54e 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -207,6 +207,8 @@ int opengl_enabled = 1;
 #else
 int opengl_enabled = 0;
 #endif
+const char *dom0_input = NULL;
+int vga_passthrough = 0;
 static const char *direct_pci;
 static int nb_pci_emulation = 0;
 static char pci_emulation_config_text[MAX_PCI_EMULATION][256];
@@ -3599,7 +3601,9 @@ void do_pci_del(char *devname)
     int pci_slot;
     pci_slot = bdf_to_slot(devname);
 
-    acpi_php_del(pci_slot);
+    //acpi_php_del(pci_slot);
+    power_off_php_slot(PCI_TO_PHP_SLOT(pci_slot));
+    xenstore_record_dm_state("pci-removed");
 }
 
 void do_pci_add(char *devname)
@@ -7309,6 +7313,7 @@ static void help(int exitcode)
 #ifdef CONFIG_OPENGL
            "-disable-opengl disable OpenGL rendering, using SDL"
 #endif
+           "-dom0-input enable dom0 controlling qemu\n"
           "-direct-pci s   specify pci passthrough, with configuration string s\n"
            "-pciemulation       name:vendorid:deviceid:command:status:revision:classcode:headertype:subvendorid:subsystemid:interruputline:interruputpin\n"
            "-vcpus          set CPU number of guest platform\n"
@@ -7507,6 +7512,8 @@ enum {
     QEMU_OPTION_no_quit,
     QEMU_OPTION_domid,
     QEMU_OPTION_disable_opengl,
+    QEMU_OPTION_dom0_input,
+    QEMU_OPTION_vga_passthrough,
     QEMU_OPTION_direct_pci,
     QEMU_OPTION_pci_emulation,
     QEMU_OPTION_vcpus,
@@ -7618,6 +7625,8 @@ const QEMUOption qemu_options[] = {
 #ifdef CONFIG_OPENGL
     { "disable-opengl", 0, QEMU_OPTION_disable_opengl },
 #endif
+    { "dom0-input", 1, QEMU_OPTION_dom0_input },
+    { "vga-passthrough", 0, QEMU_OPTION_vga_passthrough },
     { "vcpus", 1, QEMU_OPTION_vcpus },
     { "acpi", 0, QEMU_OPTION_acpi }, /* deprecated, for xend compatibility */
     { "direct_pci", HAS_ARG, QEMU_OPTION_direct_pci },
@@ -8386,8 +8395,14 @@ int main(int argc, char **argv)
             case QEMU_OPTION_disable_opengl:
                 opengl_enabled = 0;
                 break;
+            case QEMU_OPTION_dom0_input:
+                dom0_input = optarg;
+                break;
+            case QEMU_OPTION_vga_passthrough:
+                vga_passthrough = 1;
+                break;
             case QEMU_OPTION_direct_pci:
-               direct_pci = optarg;
+                direct_pci = optarg;
                 break;
             case QEMU_OPTION_vcpus:
                 vcpus = atoi(optarg);
@@ -8773,10 +8788,10 @@ int main(int argc, char **argv)
         vnc_display_port = vnc_display_open(ds, vnc_display, vncunused);
         if (vnc_display_port < 0)
             exit(1);
-       xenstore_write_vncport(vnc_display_port);
+        xenstore_write_vncport(vnc_display_port);
     } else
 #if defined(CONFIG_CURSES)
-    if (curses) {
+        if (curses) {
         curses_display_init(ds, full_screen);
     } else
 #endif
@@ -8850,7 +8865,10 @@ int main(int argc, char **argv)
     }
 
     if (strlen(direct_pci_str) > 0)
+    {
         direct_pci = direct_pci_str;
+        fprintf(stderr, "direct_pci_str: %s\n", direct_pci_str);
+    }
 
     machine->init(ram_size, vga_ram_size, boot_devices, ds,
                   kernel_filename, kernel_cmdline, initrd_filename, cpu_model,