From patchwork Fri Mar 1 13:33:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 224334 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 78D402C0291 for ; Sat, 2 Mar 2013 00:34:48 +1100 (EST) Received: from localhost ([::1]:56295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6o-0003C9-LI for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 08:34:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6C-00036G-La for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBQ6B-0007O9-LM for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:08 -0500 Received: from mail-qa0-f52.google.com ([209.85.216.52]:51589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6B-0007O0-IC for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:07 -0500 Received: by mail-qa0-f52.google.com with SMTP id bs12so2151095qab.18 for ; Fri, 01 Mar 2013 05:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Zh/BFeWQvkeBH1NBSzVWPmXnCOBH3xqXzIAwEOsxZ14=; b=DINEok33OQFgE7T3Zejx44QEEzBtuXv3A1sdkPjXG2nRUN7h3mTrwJwpOqVEHFkmUC XETGW02G6vOCubnlmWdnpkJHxR4oiCMNML01UaCXD78NA8Uwm6vffZuT6hgAcysQzcvV LROVucv4DlqDLiI5FRLY5I9j7AutFyOcZ72afxFMTeBJsVAMKoRmz/rIVq+qqoqAFcwk XJX7M7CRdGMhiUv+0X8KIIXJvKXiht2F1hvutqicFUSI4PxyR3LspzvToyOI8zvIrrlw sCQpaC7f7OfaxNmw1o6DIxiE09RSCdnllAUP1p1Sy982913kcPxPiN3gLGJ1c1/qnU7k OQLw== X-Received: by 10.229.107.23 with SMTP id z23mr3673756qco.145.1362144847081; Fri, 01 Mar 2013 05:34:07 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id hr1sm19338754qeb.3.2013.03.01.05.34.05 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 01 Mar 2013 05:34:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 14:33:36 +0100 Message-Id: <1362144829-26979-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> References: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.52 Cc: peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 05/18] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX 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 Signed-off-by: Paolo Bonzini --- hw/virtio-pci.h | 2 +- hw/virtio.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index d24957c..e775525 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -75,7 +75,7 @@ struct VirtIOPCIProxy { VirtIOBlkConf blk; NICConf nic; uint32_t host_features; -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS V9fsConf fsconf; #endif virtio_serial_conf serial; diff --git a/hw/virtio.h b/hw/virtio.h index 1e206b8..ae43d25 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -19,7 +19,7 @@ #include "qdev.h" #include "sysemu/sysemu.h" #include "qemu/event_notifier.h" -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS #include "9p.h" #endif @@ -252,7 +252,7 @@ typedef struct VirtIOSCSIConf VirtIOSCSIConf; VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *conf); typedef struct VirtIORNGConf VirtIORNGConf; VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf); -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); #endif