diff options
| author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /console.c | |
| parent | print meaningful error message in case of --disable-vhost-net (diff) | |
| parent | configure: Detect and don't try to use older libcurl (diff) | |
| download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'console.c')
| -rw-r--r-- | console.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -180,7 +180,7 @@ void vga_hw_screen_dump(const char *filename) active_console = consoles[0]; /* There is currently no way of specifying which screen we want to dump, so always dump the first one. */ - if (consoles[0]->hw_screen_dump) + if (consoles[0] && consoles[0]->hw_screen_dump) consoles[0]->hw_screen_dump(consoles[0]->hw, filename); active_console = previous_active_console; } |