diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:05:39 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-05 19:05:39 -0300 |
| commit | f43d541cb9ee6c40ae2af2ea37aa17f966264277 (patch) | |
| tree | d8e7f9497ac6aac8779db11252c8fc1b5beae739 /net/tap-solaris.c | |
| parent | afc6763567e6f43b8421f4d8db13e9257c9566c6 (diff) | |
| parent | 1ecda02b24a13f501e747b8442934829d82698ae (diff) | |
Merge commit '1ecda02b24a13f501e747b8442934829d82698ae' into upstream-merge
* commit '1ecda02b24a13f501e747b8442934829d82698ae':
error: Replace qemu_error() by error_report()
error: Don't abuse qemu_error() for non-error in scsi_hot_add()
error: Don't abuse qemu_error() for non-error in qbus_find()
error: Don't abuse qemu_error() for non-error in qdev_device_help()
error: New error_printf() and error_vprintf()
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'net/tap-solaris.c')
| -rw-r--r-- | net/tap-solaris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 0b428617b..50d127ad3 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -186,8 +186,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required *vnet_hdr = 0; if (vnet_hdr_required && !*vnet_hdr) { - qemu_error("vnet_hdr=1 requested, but no kernel " - "support for IFF_VNET_HDR available"); + error_report("vnet_hdr=1 requested, but no kernel " + "support for IFF_VNET_HDR available"); close(fd); return -1; } |