From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGODq-0006Ix-LD for qemu-devel@nongnu.org; Mon, 02 Sep 2013 03:06:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGODi-0006eD-8H for qemu-devel@nongnu.org; Mon, 02 Sep 2013 03:06:50 -0400 Received: from mail-oa0-x22e.google.com ([2607:f8b0:4003:c02::22e]:37837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGODi-0006e8-3e for qemu-devel@nongnu.org; Mon, 02 Sep 2013 03:06:42 -0400 Received: by mail-oa0-f46.google.com with SMTP id o20so4831757oag.5 for ; Mon, 02 Sep 2013 00:06:41 -0700 (PDT) From: Liu Ping Fan Date: Mon, 2 Sep 2013 15:06:11 +0800 Message-Id: <1378105571-20570-4-git-send-email-pingfank@linux.vnet.ibm.com> In-Reply-To: <1378105571-20570-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1378105571-20570-1-git-send-email-pingfank@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 3/3] pc-1.6: add compatibility for hpet intcap on pc-*-1.6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi , Jan Kiszka For guest bug compat, we limit hpet's interrupt compatibility on ioapic's IRQ2 for pc-*-1.6. As to pc-*-1.7 and newer, IRQ2, IRQ8, and IRQ16~23 are allowed. Signed-off-by: Liu Ping Fan --- hw/timer/hpet.c | 6 +----- include/hw/i386/pc.h | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 888be66..b6e8c12 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -43,11 +43,7 @@ #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 +#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 894c124..ef481bc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -219,6 +219,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