From patchwork Mon Jan 2 17:59:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 133909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3ACC81007D2 for ; Tue, 3 Jan 2012 05:54:33 +1100 (EST) Received: from localhost ([::1]:33137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmBk-0000BR-N8 for incoming@patchwork.ozlabs.org; Mon, 02 Jan 2012 13:00:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:53922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmAv-0006sc-8i for qemu-devel@nongnu.org; Mon, 02 Jan 2012 12:59:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhmAo-0000ut-Re for qemu-devel@nongnu.org; Mon, 02 Jan 2012 12:59:57 -0500 Received: from mail-yw0-f45.google.com ([209.85.213.45]:51180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhmAn-0000l6-Jg for qemu-devel@nongnu.org; Mon, 02 Jan 2012 12:59:49 -0500 Received: by mail-yw0-f45.google.com with SMTP id g71so10818606yhg.4 for ; Mon, 02 Jan 2012 09:59:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Vt8oUl5WxfZxZ2tdbtHdUqy2axeKaA5CPuHg7aJWeyc=; b=dvatTJMPYkR2cbR9KBuatl2i3CcSy5ve2OXTGKiqtw13E7FkiTdPSew/uRb3zqt/8I r/mK34H7+c9Veyl/QPWCnpVuMW096PA1oueWKip8GglW4F9IZT06Qx+9fleTFi5M3Ikb eE9u/ve3fIEz+C+KKmYdXZogDTYYzkMRSltW4= Received: by 10.236.144.227 with SMTP id n63mr63881025yhj.131.1325527189158; Mon, 02 Jan 2012 09:59:49 -0800 (PST) Received: from localhost.localdomain (host167-160-dynamic.2-87-r.retail.telecomitalia.it. [87.2.160.167]) by mx.google.com with ESMTPS id n64sm70043957yhk.4.2012.01.02.09.59.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 09:59:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Jan 2012 18:59:15 +0100 Message-Id: <1325527166-23898-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> References: <1325527166-23898-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.45 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH v2 04/15] 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 e0df6ef..2edd249 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -34,7 +34,7 @@ typedef struct { BlockConf block; char *block_serial; 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 7303b6c..2bd11f7 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -20,7 +20,7 @@ #include "sysemu.h" #include "block.h" #include "event_notifier.h" -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS #include "9p.h" #endif @@ -198,7 +198,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, struct virtio_net_conf *net); typedef struct virtio_serial_conf virtio_serial_conf; VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); VirtIODevice *virtio_balloon_init(DeviceState *dev); -#ifdef CONFIG_LINUX +#ifdef CONFIG_VIRTFS VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); #endif