From patchwork Mon Sep 17 10:33:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1466451 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 36010DF2D8 for ; Mon, 17 Sep 2012 10:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753486Ab2IQKdg (ORCPT ); Mon, 17 Sep 2012 06:33:36 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:45017 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313Ab2IQKdf (ORCPT ); Mon, 17 Sep 2012 06:33:35 -0400 Received: by wibhr14 with SMTP id hr14so2311659wib.1 for ; Mon, 17 Sep 2012 03:33: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:x-mailer; bh=SvQEAasKi4twsqshDWUELAXd5P9y1n2y1OKVgC0qPAA=; b=P9DKrAr6Q02F5zgAwEcml6fIHINooo+O3/bwYPUT5x0l0HI/4e5986FBuOlm3xBQt1 e6SCCD9dudzROMyUDNN91+hOD6xJvxKYa8MrLubLIL5CP7ddSlyrjYU7tG13Fm5/CC/N FLUaPbxDu0jwvQG9Lnc3Kbb8QtFe2yK8nefiIZ5w/6dEu8ydN+lCYJHW2BFJCjkxoeph Jg+kmC3k7bpHwIxt89CmDGe3mTx4rFREV7PCIVy6VsHqFTy86dQwDRG54gBheZ32ph0l 7gBwd5243/kFdGMj7yG0CA9teSDQwPHqtaqPrc7oRey+RpaEv1CIv6WCKE7Vj2r0zFmc kWdg== Received: by 10.180.104.197 with SMTP id gg5mr15219946wib.9.1347878014573; Mon, 17 Sep 2012 03:33:34 -0700 (PDT) Received: from localhost.localdomain ([37.46.33.122]) by mx.google.com with ESMTPS id dp8sm24979798wib.3.2012.09.17.03.33.25 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 03:33:27 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: asias.hejun@gmail.com, mingo@elte.hu, gorcunov@openvz.org, kvm@vger.kernel.org, kashyap.cv@gmail.com, Sasha Levin Subject: [PATCH] kvm tools: fix SDL build error when libsdl isn't installed Date: Mon, 17 Sep 2012 12:33:39 +0200 Message-Id: <1347878019-32683-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org We used wrong prototypes for sdl init/exit when libsdl wasn't installed when building. This would cause build errors. Reported-by: Kashyap Chamarthy Signed-off-by: Sasha Levin --- tools/kvm/include/kvm/sdl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/include/kvm/sdl.h b/tools/kvm/include/kvm/sdl.h index b444333..19e1d74 100644 --- a/tools/kvm/include/kvm/sdl.h +++ b/tools/kvm/include/kvm/sdl.h @@ -9,11 +9,11 @@ struct framebuffer; int sdl__init(struct kvm *kvm); int sdl__exit(struct kvm *kvm); #else -static inline void sdl__init(struct kvm *kvm) +static inline int sdl__init(struct kvm *kvm) { die("SDL support not compiled in. (install the SDL-dev[el] package)"); } -static inline void sdl__exit(struct kvm *kvm) +static inline int sdl__exit(struct kvm *kvm) { die("SDL support not compiled in. (install the SDL-dev[el] package)"); }