From patchwork Tue Feb 1 16:53:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 81364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A236DB7184 for ; Wed, 2 Feb 2011 06:45:25 +1100 (EST) Received: from localhost ([127.0.0.1]:60365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkJrA-0002Sy-Q8 for incoming@patchwork.ozlabs.org; Tue, 01 Feb 2011 12:17:32 -0500 Received: from [140.186.70.92] (port=59444 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkJmn-0000AD-MT for qemu-devel@nongnu.org; Tue, 01 Feb 2011 12:13:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkJTr-0008W9-DD for qemu-devel@nongnu.org; Tue, 01 Feb 2011 11:53:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkJTr-0008Vk-3Q for qemu-devel@nongnu.org; Tue, 01 Feb 2011 11:53:27 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p11GrPWj027733 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Feb 2011 11:53:25 -0500 Received: from blackpad.lan.raisama.net (ovpn-113-113.phx2.redhat.com [10.3.113.113]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p11GrOhU027496; Tue, 1 Feb 2011 11:53:25 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 10444209D32; Tue, 1 Feb 2011 14:53:23 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 1 Feb 2011 14:53:23 -0200 Message-Id: <1296579203-21083-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1296579203-21083-1-git-send-email-ehabkost@redhat.com> References: <1296579203-21083-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Juan Quintela Subject: [Qemu-devel] [PATCH 4/4] add CONFIG_VMPORT option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows vmport to be easily enabled or disabled at build time. Signed-off-by: Eduardo Habkost --- Makefile.target | 3 ++- default-configs/i386-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 2 ++ hw/pc_piix.c | 2 ++ 4 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index c184af6..c55951a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -220,12 +220,13 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o -obj-i386-y += vmport.o hpet.o applesmc.o +obj-i386-y += hpet.o applesmc.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o obj-i386-$(CONFIG_VMMOUSE) += vmmouse.o +obj-i386-$(CONFIG_VMPORT) += vmport.o # shared objects diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index a4450bc..e195b47 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -23,4 +23,6 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_VIRTIO_PCI=y +CONFIG_VMPORT=y +#NOTE: VMMOUSE depends on VMPORT CONFIG_VMMOUSE=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 658b249..8782cb9 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -23,4 +23,6 @@ CONFIG_NE2000_ISA=y CONFIG_PIIX_PCI=y CONFIG_SOUND=y CONFIG_VIRTIO_PCI=y +CONFIG_VMPORT=y +#NOTE: VMMOUSE depends on VMPORT CONFIG_VMMOUSE=y diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 7d29d43..c0697e0 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -85,7 +85,9 @@ static void pc_init1(ram_addr_t ram_size, pc_cpus_init(cpu_model); +#ifdef CONFIG_VMPORT vmport_init(); +#endif /* allocate ram and load rom/bios */ pc_memory_init(ram_size, kernel_filename, kernel_cmdline, initrd_filename,