yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 6b0e2eb81618b85ea078daba4688593d5cfaeba0 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <6b0e2eb81618b85ea078daba4688593d5cfaeba0.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:17:03 +0100
0a122b
Subject: [PATCH 06/56] pc: move IO_APIC_DEFAULT_ADDRESS to
0a122b
 include/hw/i386/ioapic.h
0a122b
MIME-Version: 1.0
0a122b
Content-Type: text/plain; charset=UTF-8
0a122b
Content-Transfer-Encoding: 8bit
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-7-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56311
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 06/57] pc: move IO_APIC_DEFAULT_ADDRESS to include/hw/i386/ioapic.h
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
0a122b
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Reviewed-by: Andreas Färber <afaerber@suse.de>
0a122b
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
Reviewed-by: Andreas Färber <afaerber@suse.de>
0a122b
Message-id: 1375109277-25561-2-git-send-email-imammedo@redhat.com
0a122b
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
0a122b
(cherry picked from commit f5338ee30d91693f5805208e58df80f0551c3896)
0a122b
---
0a122b
 include/hw/i386/ioapic.h | 1 +
0a122b
 hw/i386/pc.c             | 2 --
0a122b
 2 files changed, 1 insertion(+), 2 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/i386/pc.c             | 2 --
0a122b
 include/hw/i386/ioapic.h | 1 +
0a122b
 2 files changed, 1 insertion(+), 2 deletions(-)
0a122b
0a122b
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
0a122b
index 9e5a082..333e83f 100644
0a122b
--- a/hw/i386/pc.c
0a122b
+++ b/hw/i386/pc.c
0a122b
@@ -75,8 +75,6 @@
0a122b
 #define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)
0a122b
 #define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)
0a122b
 
0a122b
-#define IO_APIC_DEFAULT_ADDRESS 0xfec00000
0a122b
-
0a122b
 #define E820_NR_ENTRIES		16
0a122b
 
0a122b
 struct e820_entry {
0a122b
diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h
0a122b
index 86e63da..6245388 100644
0a122b
--- a/include/hw/i386/ioapic.h
0a122b
+++ b/include/hw/i386/ioapic.h
0a122b
@@ -21,6 +21,7 @@
0a122b
 #define HW_IOAPIC_H
0a122b
 
0a122b
 #define IOAPIC_NUM_PINS 24
0a122b
+#define IO_APIC_DEFAULT_ADDRESS 0xfec00000
0a122b
 
0a122b
 void ioapic_eoi_broadcast(int vector);
0a122b
 
0a122b
-- 
0a122b
1.7.11.7
0a122b