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