From patchwork Tue Jul 22 17:28:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Schopp X-Patchwork-Id: 34107 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A43A20672 for ; Tue, 22 Jul 2014 17:30:16 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf68278434pab.1 for ; Tue, 22 Jul 2014 10:30:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:subject:from:to:date:message-id :user-agent:mime-version:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=LdRYEoLofaEj0YTkqocJwa3CESTlDmXm73XD14tmqzw=; b=ZzypxiVlJzhucUiRXoMhHh5ZEn1ngUl34n/P6s9m0iQX9JqzzJvBMtzb9ZXV4g1Bg0 9pXcgo0T9YDtuzBSl8ye973y9zYwKDBaxJv0iG8H7XpEl9ihfrDRdp41suoy6RzXT+n5 vCxcd5n9ffbrr0PTeM445/aTIM3Rqsu2RO84I++u8iVoddmXFSKNLL0Tpn1GKqzVTMs7 0GzauNewwmRCgxVkJAmWLzcJ8kC3xejKmOSc6c56LBo1qGhRdBILS26rKndMt2i4AT/c H+0cSJf3Bc8ZDUrfQC2Oe0yten+EBN134DYgspQXM8QAMWelbLZ69uBo1EvV41ueVR8B U19g== X-Gm-Message-State: ALoCoQmN7Wdp09UuZTzfEBWxQf8PDWVXUJ+7GVfy8Zo8CaGeRC98TyYb6LUYaQa7BPzB1IFeBUSq X-Received: by 10.66.66.163 with SMTP id g3mr17200948pat.3.1406050215338; Tue, 22 Jul 2014 10:30:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.50.78.227 with SMTP id e3ls2370974igx.21.canary; Tue, 22 Jul 2014 10:30:15 -0700 (PDT) X-Received: by 10.66.117.38 with SMTP id kb6mr35644986pab.37.1406050215147; Tue, 22 Jul 2014 10:30:15 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id cx1si1846547vec.38.2014.07.22.10.30.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 10:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so10750387vcb.35 for ; Tue, 22 Jul 2014 10:30:14 -0700 (PDT) X-Received: by 10.220.50.8 with SMTP id x8mr35393849vcf.18.1406050214803; Tue, 22 Jul 2014 10:30:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp213795vcb; Tue, 22 Jul 2014 10:30:14 -0700 (PDT) X-Received: by 10.68.68.133 with SMTP id w5mr5517383pbt.166.1406050214009; Tue, 22 Jul 2014 10:30:14 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ou8si560316pdb.247.2014.07.22.10.30.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jul 2014 10:30:14 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X9drn-0007TF-36; Tue, 22 Jul 2014 17:28:43 +0000 Received: from mail-by2lp0235.outbound.protection.outlook.com ([207.46.163.235] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X9drk-0007Qk-Qg for linux-arm-kernel@lists.infradead.org; Tue, 22 Jul 2014 17:28:41 +0000 Received: from BLUPR02CA059.namprd02.prod.outlook.com (25.160.23.177) by BN1PR02MB037.namprd02.prod.outlook.com (10.242.210.147) with Microsoft SMTP Server (TLS) id 15.0.990.7; Tue, 22 Jul 2014 17:28:17 +0000 Received: from BN1BFFO11FD052.protection.gbl (2a01:111:f400:7c10::1:110) by BLUPR02CA059.outlook.office365.com (2a01:111:e400:8ad::49) with Microsoft SMTP Server (TLS) id 15.0.990.7 via Frontend Transport; Tue, 22 Jul 2014 17:28:17 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BN1BFFO11FD052.mail.protection.outlook.com (10.58.145.7) with Microsoft SMTP Server id 15.0.980.11 via Frontend Transport; Tue, 22 Jul 2014 17:28:16 +0000 X-WSS-ID: 0N94J72-08-COG-02 X-M-MSG: Received: from satlvexedge01.amd.com (satlvexedge01.amd.com [10.177.96.28]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 23814D16003; Tue, 22 Jul 2014 12:28:14 -0500 (CDT) Received: from SATLEXDAG03.amd.com (10.181.40.7) by satlvexedge01.amd.com (10.177.96.28) with Microsoft SMTP Server (TLS) id 14.2.328.9; Tue, 22 Jul 2014 12:28:25 -0500 Received: from joelaarch64.amd.com (10.180.168.240) by satlexdag03.amd.com (10.181.40.7) with Microsoft SMTP Server (TLS) id 14.2.328.9; Tue, 22 Jul 2014 13:28:14 -0400 Subject: [PATCH] kvmtool: arm64: fix compilation error From: Joel Schopp To: , , Date: Tue, 22 Jul 2014 12:28:09 -0500 Message-ID: <20140722172809.4939.92258.stgit@joelaarch64.amd.com> User-Agent: StGit/0.17.1-4-g4a0c1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(428002)(199002)(189002)(47776003)(107046002)(74502001)(92566001)(68736004)(103116003)(2201001)(81342001)(31966008)(80022001)(20776003)(105586002)(85852003)(102836001)(64706001)(97746001)(19580395003)(2171001)(92726001)(53416004)(99396002)(50466002)(77096002)(81542001)(83322001)(4396001)(85306003)(86362001)(76482001)(77982001)(87936001)(106466001)(19580405001)(74662001)(46102001)(54356999)(79102001)(83072002)(97736001)(229853001)(33646002)(95666004)(83506001)(44976005)(23676002)(84676001)(21056001)(101416001)(50986999)(71626003); DIR:OUT; SFP:; SCL:1; SRVR:BN1PR02MB037; H:atltwp02.amd.com; FPR:; MLV:nov; PTR:InfoDomainNonexistent; MX:1; LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02801ACE41 Received-SPF: None (: amd.com does not designate permitted sender hosts) X-OriginatorOrg: amd4.onmicrosoft.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140722_102840_947543_620E2CEC X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [207.46.163.235 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [207.46.163.235 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record Cc: Pekka Enberg X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: joel.schopp@amd.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Currently tools/kvm doesn't build on arm64 when gtk3 is present. The error looks like this: LINK lkvm ui/gtk3.o: In function `kvm_gtk_key_press': /extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:201: undefined reference to `kbd_queue' /extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:204: undefined reference to `kbd_queue' /extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:216: undefined reference to `kbd_queue' /extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:217: undefined reference to `kbd_queue' /extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:218: undefined reference to `kbd_queue' ui/gtk3.o:/extra/sb/linux-kvm/tools/kvm/ui/gtk3.c:219: more undefined references to `kbd_queue' follow collect2: error: ld returned 1 exit status make: *** [lkvm] Error 1 The patch below makes the error go away and the resulting lkvm runs on arm64. Cc: Pekka Enberg Signed-off-by: Joel Schopp --- tools/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 880d580..fba60f1 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -102,6 +102,7 @@ OBJS += hw/pci-shmem.o OBJS += kvm-ipc.o OBJS += builtin-sandbox.o OBJS += virtio/mmio.o +OBJS += hw/i8042.o # Translate uname -m into ARCH string ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/ \ @@ -129,7 +130,6 @@ ifeq ($(ARCH),x86) OBJS += x86/kvm.o OBJS += x86/kvm-cpu.o OBJS += x86/mptable.o - OBJS += hw/i8042.o # Exclude BIOS object files from header dependencies. OTHEROBJS += x86/bios.o OTHEROBJS += x86/bios/bios-rom.o