| commit | 43f43cd41c18e973149061cf333fbe1732f28d2e | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 22 Nov 2009 13:30:56 +0000 (22 15:30 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 22 Nov 2009 13:30:56 +0000 (22 15:30 +0200) | ||
| tree | 09d777980c87f9dcdc433fa504a51a6863405082 | treesnapshot (tar.gz zip) |
| parent | 5ba85b849016cb2808765b6b5c18e1ed4cf2c179 | commitdiff |
| parent | dd4239d6574ca41c94fc0d0f77ddc728510ffc57 | commitdiff |
Merge commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57' into upstream-merge
* commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57':
Allow build of linuxboot.S with old assemblers
Avoid segfault on net_tap_init() failure
tap-bsd: handle ifname on FreeBSD hosts
Fix tap breakage on BSD hosts (no IFF_VNET_HDR)
Fix OpenBSD build of qemu-io
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57':
Allow build of linuxboot.S with old assemblers
Avoid segfault on net_tap_init() failure
tap-bsd: handle ifname on FreeBSD hosts
Fix tap breakage on BSD hosts (no IFF_VNET_HDR)
Fix OpenBSD build of qemu-io
Signed-off-by: Avi Kivity <avi@redhat.com>