From: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: jasowang@redhat.com, Jesse Larrew <jlarrew@linux.vnet.ibm.com>,
mdroth@linux.vnet.ibm.com, fred.konrad@greensocs.com
Subject: [Qemu-devel] [PATCH 3/3] virtio-net: revert MAC address workaround
Date: Tue, 4 Jun 2013 11:22:45 -0500 [thread overview]
Message-ID: <1370362965-3937-4-git-send-email-jlarrew@linux.vnet.ibm.com> (raw)
In-Reply-To: <1370362965-3937-1-git-send-email-jlarrew@linux.vnet.ibm.com>
With a more permanent solution in place, the workaround in commit
e9016ee2bda1b7757072b856b2196f691aee3388 is no longer needed.
Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
---
hw/net/virtio-net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index e09288f..c1c80aa 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1325,7 +1325,7 @@ void virtio_net_set_config_size(VirtIONet *n, uint32_t host_features)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
int i, config_size = 0;
- host_features |= (1 << VIRTIO_NET_F_MAC);
+
for (i = 0; feature_sizes[i].flags != 0; i++) {
if (host_features & feature_sizes[i].flags) {
config_size = MAX(feature_sizes[i].end, config_size);
--
1.7.11.7
prev parent reply other threads:[~2013-06-04 16:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 16:22 [Qemu-devel] [PATCH 0/3] Notify devices when a bus is attached Jesse Larrew
2013-06-04 16:22 ` [Qemu-devel] [PATCH 1/3] virtio: add bus_plugged() callback to VirtioDeviceClass Jesse Larrew
2013-06-04 17:35 ` Andreas Färber
2013-06-04 20:02 ` Jesse Larrew
2013-06-05 15:18 ` Frederic Konrad
2013-06-05 15:09 ` Frederic Konrad
2013-06-04 16:22 ` [Qemu-devel] [PATCH 2/3] virtio-net: implement bus_plugged() Jesse Larrew
2013-06-04 16:22 ` Jesse Larrew [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370362965-3937-4-git-send-email-jlarrew@linux.vnet.ibm.com \
--to=jlarrew@linux.vnet.ibm.com \
--cc=fred.konrad@greensocs.com \
--cc=jasowang@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).