|
 |
d81766 |
From aab4187704935affc5f653d3bf673b608807b457 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Amos Kong <akong@redhat.com>
|
|
|
d81766 |
Date: Thu, 7 Nov 2013 08:38:28 +0100
|
|
|
d81766 |
Subject: don't disable ctrl_mac_addr feature for 6.5 machine (RHEL only)
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Amos Kong <akong@redhat.com>
|
|
|
d81766 |
Message-id: <1383813508-6353-1-git-send-email-akong@redhat.com>
|
|
|
d81766 |
Patchwork-id: 55592
|
|
|
d81766 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH] don't disable ctrl_mac_addr feature for 6.5 machine (RHEL only)
|
|
|
d81766 |
Bugzilla: 1005039
|
|
|
d81766 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Bugzilla: 1005039
|
|
|
d81766 |
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6540840
|
|
|
d81766 |
Test: tested by myself
|
|
|
d81766 |
|
|
|
d81766 |
ctrl_mac_addr is already supported in qemu-kvm 6.5,
|
|
|
d81766 |
we should not disable this feature for 6.5 machine type.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Amos Kong <akong@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
d81766 |
index 1b21f93..30a87d4 100644
|
|
|
d81766 |
--- a/hw/i386/pc_piix.c
|
|
|
d81766 |
+++ b/hw/i386/pc_piix.c
|
|
|
d81766 |
@@ -985,10 +985,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
d81766 |
.value = stringify(1),\
|
|
|
d81766 |
},{\
|
|
|
d81766 |
.driver = "virtio-net-pci",\
|
|
|
d81766 |
- .property = "ctrl_mac_addr",\
|
|
|
d81766 |
- .value = "off",\
|
|
|
d81766 |
- },{\
|
|
|
d81766 |
- .driver = "virtio-net-pci",\
|
|
|
d81766 |
.property = "mq",\
|
|
|
d81766 |
.value = "off",\
|
|
|
d81766 |
},{\
|
|
|
d81766 |
@@ -1113,6 +1109,10 @@ static QEMUMachine pc_machine_rhel650 = {
|
|
|
d81766 |
.driver = "hda-output",\
|
|
|
d81766 |
.property = "mixer",\
|
|
|
d81766 |
.value = "off",\
|
|
|
d81766 |
+ },{\
|
|
|
d81766 |
+ .driver = "virtio-net-pci",\
|
|
|
d81766 |
+ .property = "ctrl_mac_addr",\
|
|
|
d81766 |
+ .value = "off",\
|
|
|
d81766 |
}
|
|
|
d81766 |
|
|
|
d81766 |
static void pc_init_rhel640(MachineState *machine)
|