From patchwork Thu Oct 10 07:56:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 282149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E2232C00A8 for ; Thu, 10 Oct 2013 18:58:53 +1100 (EST) Received: from localhost ([::1]:45488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUB91-0000ML-90 for incoming@patchwork.ozlabs.org; Thu, 10 Oct 2013 03:58:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUB7U-0006qY-Gr for qemu-devel@nongnu.org; Thu, 10 Oct 2013 03:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUB7M-0005yw-3G for qemu-devel@nongnu.org; Thu, 10 Oct 2013 03:57:16 -0400 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:52673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUB7L-0005yl-SA for qemu-devel@nongnu.org; Thu, 10 Oct 2013 03:57:08 -0400 Received: by mail-pb0-f41.google.com with SMTP id rp2so2192720pbb.28 for ; Thu, 10 Oct 2013 00:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/LwVvC+besepkw8cQzQ+D3t29M/gkL7SvFTnYVJeWG8=; b=Vl2BvL/nN7QuJ2/2+kFMbRR/6UzPtiXa0DBzJauCY7cDKGiAUEeTyzCd/Y6VdIeen1 7+mEEtwZMs4QgaH513UyDcOQzYenyUZFVEaR2YP9CkcPYk3DEFijZdxWjIRQ9+rKao8/ 7x2wjIRdNuhr32UaVKqajt9hDUIFKtcPWMnRlNhbODj30U2bUdrBRxo6ZvOzjKj0N+ox +34UPDvqDRtGlL4Q+doh5X8x5giHSNwzHUE2K82tj8oPJIbHWa/KYksFz7wsOaXVAh7T 2o8G2V3Wb+BAEtQtcYcBPj0agR7Yns7nUwZcOVG5so2csKpoa+OW6aVI+4L2qP6IQnPm pw2Q== X-Received: by 10.68.232.39 with SMTP id tl7mr209053pbc.204.1381391826899; Thu, 10 Oct 2013 00:57:06 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id ab4sm51339145pbc.43.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Oct 2013 00:57:06 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Thu, 10 Oct 2013 15:56:18 +0800 Message-Id: <1381391779-27718-5-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1381391779-27718-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1381391779-27718-1-git-send-email-pingfank@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::229 Cc: Paolo Bonzini , Anthony Liguori , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v6 4/5] PC: add hpet compat to trace compatability version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For guest bug compat, we need to limit hpet's intcap on IRQ2 for pc-q35-1.7 and earlier. We use hpet's compat property to indicate the PC version. Signed-off-by: Liu Ping Fan diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c6042c7..90f1ea4 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -346,6 +346,10 @@ static QEMUMachine pc_i440fx_machine_v1_7 = { .alias = "pc", .init = pc_init_pci, .is_default = 1, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_1_7, + { /* end of list */ } + }, }; #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ca84e1c..569f946 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -270,6 +270,10 @@ static QEMUMachine pc_q35_machine_v1_7 = { .name = "pc-q35-1.7", .alias = "q35", .init = pc_q35_init, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_1_7, + { /* end of list */ } + }, }; #define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 69ce587..3cbe71e 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -76,6 +76,7 @@ typedef struct HPETState { qemu_irq pit_enabled; uint8_t num_timers; uint32_t intcap; + uint8_t compat; HPETTimer timer[HPET_MAX_TIMERS]; /* Memory-mapped, software visible registers */ @@ -757,6 +758,7 @@ static Property hpet_device_properties[] = { DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS), DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false), DEFINE_PROP_UINT32("intcap", HPETState, intcap, 0), + DEFINE_PROP_UINT8("compat", HPETState, compat, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9b2ddc4..80aa7bd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -225,7 +225,15 @@ void pvpanic_init(ISABus *bus); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#define PC_COMPAT_1_7 \ + {\ + .driver = "hpet",\ + .property = "compat",\ + .value = stringify(1),\ + } + #define PC_COMPAT_1_6 \ + PC_COMPAT_1_7, \ {\ .driver = "e1000",\ .property = "mitigation",\