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