From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJxYA-00067A-4m for qemu-devel@nongnu.org; Wed, 11 Sep 2013 23:26:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJxY1-0003GL-NY for qemu-devel@nongnu.org; Wed, 11 Sep 2013 23:26:34 -0400 Received: from mail-oa0-x22d.google.com ([2607:f8b0:4003:c02::22d]:44753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJxY1-0003GB-JC for qemu-devel@nongnu.org; Wed, 11 Sep 2013 23:26:25 -0400 Received: by mail-oa0-f45.google.com with SMTP id m6so10045087oag.4 for ; Wed, 11 Sep 2013 20:26:24 -0700 (PDT) From: Liu Ping Fan Date: Thu, 12 Sep 2013 11:25:18 +0800 Message-Id: <1378956318-23395-6-git-send-email-pingfank@linux.vnet.ibm.com> In-Reply-To: <1378956318-23395-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1378956318-23395-1-git-send-email-pingfank@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v5 5/5] PC-1.6: add compatibility for hpet intcap on pc-q35-1.6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Jan Kiszka , Stefan Hajnoczi , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= For guest bug compat, we limit hpet's interrupt compatibility on ioapic's IRQ2 for pc-q35-1.6. As to pc-35-1.7 and newer, IRQ2, IRQ8, and IRQ16~23 are allowed. Signed-off-by: Liu Ping Fan --- hw/timer/hpet.c | 7 ++----- include/hw/i386/pc.h | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 46903b9..7af495a 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -43,11 +43,8 @@ #define HPET_MSI_SUPPORT 0 -/* For bug compat, using only IRQ2. Soon it will be fixed as - * 0xff0104ULL, i.e using IRQ16~23, IRQ8 and IRQ2 after - * introducing pc-1.6 compat. - */ -#define HPET_TN_INT_CAP_DEFAULT 0x4ULL +/* using IRQ16~23, IRQ8 and IRQ2 */ +#define HPET_TN_INT_CAP_DEFAULT 0xff0104ULL #define TYPE_HPET "hpet" #define HPET(obj) OBJECT_CHECK(HPETState, (obj), TYPE_HPET) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9dd077f..79c63b3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -231,6 +231,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .driver = "e1000",\ .property = "mitigation",\ .value = "off",\ + },{\ + .driver = "hpet",\ + .property = "intcap",\ + .value = stringify(4),\ } #define PC_COMPAT_1_5 \ -- 1.8.1.4