diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2011-05-03 19:22:38 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-05-03 19:22:38 -0300 |
| commit | a1459cad89ba49fe63a340b11ba38e31eff0611d (patch) | |
| tree | 4a0b400b1f23bcb27902d77b25efa4a481cf3018 /qemu-options.hx | |
| parent | Merge commit '5ee8ad71e159e724e2fa1af6b2c502668179502a' into upstream-merge (diff) | |
| parent | kvm: Install specialized interrupt handler (diff) | |
| download | qemu-kvm-a1459cad89ba49fe63a340b11ba38e31eff0611d.tar.gz qemu-kvm-a1459cad89ba49fe63a340b11ba38e31eff0611d.tar.bz2 qemu-kvm-a1459cad89ba49fe63a340b11ba38e31eff0611d.zip | |
Merge commit 'aa7f74d1199020a29c677bc80518df5267bfe73f' into upstream-merge
* commit 'aa7f74d1199020a29c677bc80518df5267bfe73f': (70 commits)
kvm: Install specialized interrupt handler
Redirect cpu_interrupt to callback handler
Break up user and system cpu_interrupt implementations
kvm: create kvmclock when one of the flags are present
kvm: add kvmclock to its second bit
x86: Allow multiple cpu feature matches of lookup_feature
kvm: use kernel-provided para_features instead of statically coming up with new capabilities
Don't zero out buffer in sched_getaffinity
Fix buffer overrun in sched_getaffinity
linux-user: Fix compilation for "old" linux versions
virtfs: fix build due from rename
virtio-serial: Fix endianness bug in the config space
char: Detect chardev release by NULL handlers as well as NULL opaque
char: Allow devices to use a single multiplexed chardev.
spice-chardev: listen to frontend guest open / close
virtio-console: notify backend of guest open / close
chardev: Allow frontends to notify backends of guest open / close
target-arm: Don't update base register on abort in Thumb T1 LDM
target-arm: fix LDMIA bug on page boundary
ioapic: Do not set irr for masked edge IRQs
...
Conflicts:
kvm-all.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 5956ec6a4..443ed65c7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1154,7 +1154,7 @@ Assign symbolic name for use in monitor commands. @item net=@var{addr}[/@var{mask}] Set IP network address the guest will see. Optionally specify the netmask, either in the form a.b.c.d or as number of valid top-most bits. Default is -10.0.2.0/8. +10.0.2.0/24. @item host=@var{addr} Specify the guest-visible address of the host. Default is the 2nd IP in the @@ -1170,7 +1170,7 @@ Specifies the client hostname reported by the builtin DHCP server. @item dhcpstart=@var{addr} Specify the first of the 16 IPs the built-in DHCP server can assign. Default -is the 16th to 31st IP in the guest network, i.e. x.x.x.16 to x.x.x.31. +is the 15th to 31st IP in the guest network, i.e. x.x.x.15 to x.x.x.31. @item dns=@var{addr} Specify the guest-visible address of the virtual nameserver. The address must |