diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
| commit | 818c2e1b9777599d333855330d94050b3432c8b7 (patch) | |
| tree | df85b289b7c0f797fbf5bf8ca5bca4422b387aa7 /hw/pc.c | |
| parent | 4058fd98fd7e9c476774717adbd49698dd273166 (diff) | |
| parent | 7572150c189c6553c2448334116ab717680de66d (diff) | |
| download | qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.gz qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.bz2 qemu-818c2e1b9777599d333855330d94050b3432c8b7.zip | |
Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu:
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
spice: add qxl device
spice: add qxl vgabios binary.
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -40,6 +40,7 @@ #include "sysbus.h" #include "sysemu.h" #include "blockdev.h" +#include "ui/qemu-spice.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -992,6 +993,13 @@ void pc_vga_init(PCIBus *pci_bus) pci_vmsvga_init(pci_bus); else fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); +#ifdef CONFIG_SPICE + } else if (qxl_enabled) { + if (pci_bus) + pci_create_simple(pci_bus, -1, "qxl-vga"); + else + fprintf(stderr, "%s: qxl: no PCI bus\n", __FUNCTION__); +#endif } else if (std_vga_enabled) { if (pci_bus) { pci_vga_init(pci_bus); |