From patchwork Tue Mar 30 08:20:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 89253 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2U8KpN6006259 for ; Tue, 30 Mar 2010 08:20:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755947Ab0C3IUr (ORCPT ); Tue, 30 Mar 2010 04:20:47 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:48031 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755616Ab0C3IU1 (ORCPT ); Tue, 30 Mar 2010 04:20:27 -0400 Received: by bwz1 with SMTP id 1so4153687bwz.21 for ; Tue, 30 Mar 2010 01:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=Y8g3x6mAkoH54D0LPZqJfFMFHWUNLu1/lMtwcMk7SZY=; b=L8IHQONrdbuGF86HEVixMBFKPKZqkAelBAsrvHCgj4dSOZy1Bx4peHsKZ5dR5zvuWb f0lB57T3jr/pp4TEMHFfAb46w6zv2oUOPANqkYpsRa73nt+09WrEyHPEwxVY/ONjlg/L 6lXHzVOWhsh+79ISdEIwKd6FSqtG6qNlhjmkM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=dbMc3QAucBQes0F8yONnluXo/QsN6XswNN4TQoPxkj3odA99lZsCh36GZrhB8Xbt7c jSdyn5nN0faizd/nbkXOLihJ5wtjFLnn0a1t7zbyvLwSSwfkz4/lfV/NG9uJ5DFG492R i17+w/O4p64Uq9zTPE5o2nraCt2AkRjqKAcqU= Received: by 10.204.145.6 with SMTP id b6mr365092bkv.128.1269937225825; Tue, 30 Mar 2010 01:20:25 -0700 (PDT) Received: from localhost.localdomain ([188.25.93.130]) by mx.google.com with ESMTPS id 16sm2589620bwz.9.2010.03.30.01.20.25 (version=SSLv3 cipher=RC4-MD5); Tue, 30 Mar 2010 01:20:25 -0700 (PDT) From: Eduard - Gabriel Munteanu To: joro@8bytes.org Cc: aliguori@us.ibm.com, avi@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org, Eduard - Gabriel Munteanu Subject: [RFC PATCH 3/7] acpi: move table header definition into pc.h Date: Tue, 30 Mar 2010 11:20:04 +0300 Message-Id: <56f9528faa41b71baba33887bca6cd43484452fa.1269936879.git.eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 30 Mar 2010 08:20:51 +0000 (UTC) diff --git a/hw/acpi.c b/hw/acpi.c index 8eb53da..3794f70 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -826,19 +826,6 @@ static int piix4_device_hotplug(PCIDevice *dev, int state) return 0; } -struct acpi_table_header -{ - char signature [4]; /* ACPI signature (4 ASCII characters) */ - uint32_t length; /* Length of table, in bytes, including header */ - uint8_t revision; /* ACPI Specification minor version # */ - uint8_t checksum; /* To make sum of entire table == 0 */ - char oem_id [6]; /* OEM identification */ - char oem_table_id [8]; /* OEM table identification */ - uint32_t oem_revision; /* OEM revision number */ - char asl_compiler_id [4]; /* ASL compiler vendor ID */ - uint32_t asl_compiler_revision; /* ASL compiler revision number */ -} __attribute__((packed)); - char *acpi_tables; size_t acpi_tables_len, acpi_tables_prev_len; diff --git a/hw/pc.h b/hw/pc.h index 0cef140..92954db 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -103,6 +103,19 @@ int ioport_get_a20(void); CPUState *pc_new_cpu(const char *cpu_model); /* acpi.c */ +struct acpi_table_header +{ + char signature [4]; /* ACPI signature (4 ASCII characters) */ + uint32_t length; /* Length of table, in bytes, including header */ + uint8_t revision; /* ACPI Specification minor version # */ + uint8_t checksum; /* To make sum of entire table == 0 */ + char oem_id [6]; /* OEM identification */ + char oem_table_id [8]; /* OEM table identification */ + uint32_t oem_revision; /* OEM revision number */ + char asl_compiler_id [4]; /* ASL compiler vendor ID */ + uint32_t asl_compiler_revision; /* ASL compiler revision number */ +} __attribute__((packed)); + extern int acpi_enabled; extern char *acpi_tables; extern size_t acpi_tables_len;