From: Sasha Levin Date: Sun, 24 Jul 2011 07:42:31 +0000 (+0300) Subject: kvm tools: Set hardcoded MAC to local administered X-Git-Tag: next-20110824~3^2~84 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e756343dc7ffada2b552a678e115b95f7f7efa40;p=karo-tx-linux.git 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 --- 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); };