diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2010-03-01 20:05:17 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2010-03-01 20:05:17 +0000 |
| commit | a1e19f5eda40589a6841175c520db2194212f9df (patch) | |
| tree | bcbe03c72013732b059f409ee1ba74a1e25e07c9 /emulators/qemu-devel/files | |
| parent | Update to 2.01.01a77. For the changes since 2.01.01a75 see: (diff) | |
Update to 0.12.3, announce message is here:
http://lists.gnu.org/archive/html/qemu-devel/2010-02/msg01594.html
(Subject says 0.12.2, but in fact the message is about 0.12.3.)
Feature safe: yes
Diffstat (limited to 'emulators/qemu-devel/files')
| -rw-r--r-- | emulators/qemu-devel/files/pcap-patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch index 6b8dea448d88..75ae11e02df4 100644 --- a/emulators/qemu-devel/files/pcap-patch +++ b/emulators/qemu-devel/files/pcap-patch @@ -110,7 +110,7 @@ Index: net.c static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; -@@ -820,6 +825,228 @@ static int net_init_nic(QemuOpts *opts, +@@ -817,6 +822,226 @@ static int net_init_nic(QemuOpts *opts, return idx; } @@ -330,8 +330,6 @@ Index: net.c + return -1; + } + -+ vlan->nb_host_devs++; -+ + return 0; +} +#endif /* CONFIG_PCAP */ @@ -339,7 +337,7 @@ Index: net.c #define NET_COMMON_PARAMS_DESC \ { \ .name = "type", \ -@@ -980,6 +1207,20 @@ static struct { +@@ -977,6 +1202,20 @@ static struct { #endif /* _WIN32 */ { /* end of list */ } }, |