cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-don-t-disable-ctrl_mac_addr-feature-for-6.5-machine-.patch

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