Commit-ID: e756343dc7ffada2b552a678e115b95f7f7efa40 Gitweb: http://git.kernel.org/tip/e756343dc7ffada2b552a678e115b95f7f7efa40 Author: Sasha Levin <levinsasha928@xxxxxxxxx> AuthorDate: Sun, 24 Jul 2011 10:42:31 +0300 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Sun, 24 Jul 2011 11:01:14 +0300 kvm tools: Set hardcoded MAC to local administered This sets bit one in the first octet to 1, which means that the hardcoded MAC we use is locally administered and wasn't assigned to us. Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx> Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 4 ++-- tools/kvm/virtio/net.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 3345bf8..941129c 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -46,8 +46,8 @@ #define DEFAULT_NETWORK "user" #define DEFAULT_HOST_ADDR "192.168.33.1" #define DEFAULT_GUEST_ADDR "192.168.33.15" -#define DEFAULT_GUEST_MAC "00:15:15:15:15:15" -#define DEFAULT_HOST_MAC "00:01:01:01:01:01" +#define DEFAULT_GUEST_MAC "02:15:15:15:15:15" +#define DEFAULT_HOST_MAC "02:01:01:01:01:01" #define DEFAULT_SCRIPT "none" #define MB_SHIFT (20) diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 739f157..e865b7f 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -219,9 +219,6 @@ static bool virtio_net_pci_io_in(struct ioport *ioport, struct kvm *kvm, u16 por kvm__irq_line(kvm, pci_header.irq_line, VIRTIO_IRQ_LOW); ndev.isr = VIRTIO_IRQ_LOW; break; - case VIRTIO_MSI_CONFIG_VECTOR: - ioport__write16(data, ndev.config_vector); - break; default: ret = virtio_net_pci_io_device_specific_in(data, offset, size, count); }; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|