From e756343dc7ffada2b552a678e115b95f7f7efa40 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 24 Jul 2011 10:42:31 +0300 Subject: [PATCH] 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 Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- 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 3345bf80e80f..941129c52c0f 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 739f15744920..e865b7fb2fbf 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); }; -- 2.39.5