diff options
| author |   Avi Kivity <avi@redhat.com> | 2011-07-27 16:42:04 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-07-27 16:42:04 +0300 |
| commit | 497d8129ad4bca8a3b319ee84229d9a0f9cdd15c (patch) | |
| tree | 3f2683c96c2532993da02dabdab779c5eba7fa97 /cursor_hidden.xpm | |
| parent | Merge commit '69d7e218fd9846b7f5946fe8e17ca609c7fd7ef1' into upstream-merge (diff) | |
| parent | report serial devices created with -device in the PIIX4 config space (diff) | |
| download | qemu-kvm-497d8129ad4bca8a3b319ee84229d9a0f9cdd15c.tar.gz qemu-kvm-497d8129ad4bca8a3b319ee84229d9a0f9cdd15c.tar.bz2 qemu-kvm-497d8129ad4bca8a3b319ee84229d9a0f9cdd15c.zip | |
Merge commit '6141dbfe0a595076310f690ec8db84ad5be2cde5' into upstream-merge
* commit '6141dbfe0a595076310f690ec8db84ad5be2cde5': (66 commits)
report serial devices created with -device in the PIIX4 config space
.gitignore: ignore qemu-ga and qapi-generated
guest agent: use QERR_UNSUPPORTED for disabled RPCs
net: Consistently use qemu_macaddr_default_if_unset
net: Dump client type 'info network'
net: Refactor net_client_types
net: Improve layout of 'info network'
slirp: Forward ICMP echo requests via unprivileged sockets
slirp: Put forked exec into separate process group
slirp: Replace m_freem with m_free
slirp: Strictly associate DHCP/BOOTP and TFTP with virtual host
slirp: Canonicalize restrict syntax
slirp: Fix restricted mode
Deprecate -M command line options
Generalize -machine command line option
guest-agent: fix build with OpenBSD
xen: fix xen-mapcache build on non-Xen capable targets
target-sparc: Fix compiler errors (format strings)
USB: add usb network redirection support
usb-ehci: trace: rename "next" to "nxt".
...
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cursor_hidden.xpm')
0 files changed, 0 insertions, 0 deletions