diff options
| author |   Mark McLoughlin <markmc@redhat.com> | 2009-10-08 14:21:12 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2009-10-08 14:21:12 +0100 |
| commit | 219ad804f358d0aec3555f6b060978601885bc7c (patch) | |
| tree | 7aaf538d4f49b6dcf6b585519725177dc257a071 /sysemu.h | |
| parent | Merge commit '45a50b1668822c23afc2a89f724654e176518bc4' (diff) | |
| parent | Port -net tap to QemuOpts (diff) | |
| download | qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.tar.gz qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.tar.bz2 qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.zip | |
Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -127,6 +127,7 @@ extern const char *keyboard_layout; extern int win2k_install_hack; extern int rtc_td_hack; extern int alt_grab; +extern int ctrl_grab; extern int usb_enabled; extern int smp_cpus; extern int max_cpus; |