From patchwork Tue May 6 15:17:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 346232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 676C5141373 for ; Wed, 7 May 2014 01:18:14 +1000 (EST) Received: from localhost ([::1]:35932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whh8G-0004LS-5Y for incoming@patchwork.ozlabs.org; Tue, 06 May 2014 11:18:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whh7m-0003hD-4b for qemu-devel@nongnu.org; Tue, 06 May 2014 11:17:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whh7f-0003fl-3L for qemu-devel@nongnu.org; Tue, 06 May 2014 11:17:42 -0400 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]:34631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whh7e-0003fZ-UX for qemu-devel@nongnu.org; Tue, 06 May 2014 11:17:35 -0400 Received: by mail-qg0-f44.google.com with SMTP id i50so8207432qgf.3 for ; Tue, 06 May 2014 08:17:34 -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 :mime-version:content-type:content-transfer-encoding; bh=czYLoYMF06upcjqdwegzMMlvEbYo6u6r9n/pemMvDxU=; b=KQHZ2tDLWsSywPtALP8SueTgi3KxQkOQgS7UKzK16ZvQLC0GdgGNuwjvMA8VifSoUB s2umydHdJ7ouqoKZdjGFijv4Xny90hZecxDgO28PAgLsZlN4hkjPV6qpmyTxxONoDMsp 7zQFqOU4BwBCHJGEHXTPrKS7r2ZnSeia5ucx3Jc9Pi1jPtu2aJyWlfeFFc4bHX6xuq4B ZipfglrhlNXmrf8SwMLsc7VG5t3AsOnFiitEoCMiH8sE6v11v2QxmOim4soWCvZAwP+a MvPeNZ9dU8cm21hF3+eZNPdqWDtMsU+esSSM1XRV9jevc/813wY64gd1Y8lBeMAY8DtR LOCg== X-Received: by 10.140.37.9 with SMTP id q9mr31969700qgq.57.1399389454610; Tue, 06 May 2014 08:17:34 -0700 (PDT) Received: from ERROL.ini.cmu.edu (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id h78sm16037916qgd.10.2014.05.06.08.17.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 May 2014 08:17:34 -0700 (PDT) X-Google-Original-From: "Gabriel L. Somlo" From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Tue, 6 May 2014 11:17:24 -0400 Message-Id: <1399389445-1607-2-git-send-email-somlo@cmu.edu> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1399389445-1607-1-git-send-email-somlo@cmu.edu> References: <1399389445-1607-1-git-send-email-somlo@cmu.edu> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22c Cc: pbonzini@redhat.com, agraf@suse.de, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH v6 1/2] pc: add compat_props placeholder for 2.0 machine type 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 Add the "boilerplate" necessary for subsequent patches to simply drop in compat_props for pc machines 2.0 and older. This patch contains no functional changes. Signed-off-by: Gabriel Somlo Acked-by: Alexander Graf Acked-by: Michael S. Tsirkin Reviewed-by: Andreas Färber --- hw/i386/pc_piix.c | 4 ++++ hw/i386/pc_q35.c | 4 ++++ include/hw/i386/pc.h | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ea72502..eaf3e61 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -414,6 +414,10 @@ static QEMUMachine pc_i440fx_machine_v2_0 = { PC_I440FX_2_0_MACHINE_OPTIONS, .name = "pc-i440fx-2.0", .init = pc_init_pci_2_0, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_2_0, + { /* end of list */ } + }, }; #define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 3306f89..9517ec6 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -327,6 +327,10 @@ static QEMUMachine pc_q35_machine_v2_0 = { PC_Q35_2_0_MACHINE_OPTIONS, .name = "pc-q35-2.0", .init = pc_q35_init_2_0, + .compat_props = (GlobalProperty[]) { + PC_Q35_COMPAT_2_0, + { /* end of list */ } + }, }; #define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9f26e14..0ade0f1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -242,8 +242,12 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +#define PC_Q35_COMPAT_2_0 \ + PC_COMPAT_2_0 + #define PC_Q35_COMPAT_1_7 \ PC_COMPAT_1_7, \ + PC_Q35_COMPAT_2_0, \ {\ .driver = "hpet",\ .property = HPET_INTCAP,\ @@ -262,7 +266,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); PC_COMPAT_1_4, \ PC_Q35_COMPAT_1_5 +#define PC_COMPAT_2_0 \ + {\ + } + #define PC_COMPAT_1_7 \ + PC_COMPAT_2_0, \ {\ .driver = TYPE_USB_DEVICE,\ .property = "msos-desc",\