From patchwork Tue Apr 23 09:08:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 238823 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 908CA2C0142 for ; Tue, 23 Apr 2013 19:11:04 +1000 (EST) Received: from localhost ([::1]:53328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZFe-0002zE-NO for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 05:11:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZDk-0000fV-Je for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUZDj-0005Vp-46 for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:04 -0400 Received: from greensocs.com ([87.106.252.221]:42940 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZDi-0005Vj-RU for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:03 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 5B41440EC68; Tue, 23 Apr 2013 09:09:02 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S0Za05ccHZRK; Tue, 23 Apr 2013 11:08:57 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 0AFF040EC67; Tue, 23 Apr 2013 11:08:55 +0200 (CEST) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 1737C40EC65; Tue, 23 Apr 2013 11:08:55 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 23 Apr 2013 11:08:42 +0200 Message-Id: <1366708123-19626-4-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1366708123-19626-1-git-send-email-fred.konrad@greensocs.com> References: <1366708123-19626-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, "Aneesh Kumar K.V" , fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v4 3/4] virtio-9p: cleanup: init function. 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 From: KONRAD Frederic This remove old init function as it is no longer needed. Signed-off-by: KONRAD Frederic --- hw/9pfs/virtio-9p-device.c | 75 ++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 52 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 7f00a45..29a639e 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -46,30 +46,17 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) g_free(cfg); } -static VirtIODevice *virtio_9p_common_init(DeviceState *dev, V9fsConf *conf, - V9fsState **ps) +static int virtio_9p_device_init(VirtIODevice *vdev) { - V9fsState *s = *ps; + V9fsState *s = VIRTIO_9P(vdev); int i, len; struct stat stat; FsDriverEntry *fse; V9fsPath path; - /* - * We have two cases here: the old virtio-9p-pci device, and the - * refactored virtio-9p. - */ + virtio_init(VIRTIO_DEVICE(s), "virtio-9p", VIRTIO_ID_9P, + sizeof(struct virtio_9p_config) + MAX_TAG_LEN); - if (s == NULL) { - s = (V9fsState *)virtio_common_init("virtio-9p", - VIRTIO_ID_9P, - sizeof(struct virtio_9p_config)+ - MAX_TAG_LEN, - sizeof(V9fsState)); - } else { - virtio_init(VIRTIO_DEVICE(s), "virtio-9p", VIRTIO_ID_9P, - sizeof(struct virtio_9p_config) + MAX_TAG_LEN); - } /* initialize pdu allocator */ QLIST_INIT(&s->free_list); QLIST_INIT(&s->active_list); @@ -77,35 +64,36 @@ static VirtIODevice *virtio_9p_common_init(DeviceState *dev, V9fsConf *conf, QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next); } - s->vq = virtio_add_queue(&s->vdev, MAX_REQ, handle_9p_output); + s->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output); - fse = get_fsdev_fsentry(conf->fsdev_id); + fse = get_fsdev_fsentry(s->fsconf.fsdev_id); if (!fse) { /* We don't have a fsdev identified by fsdev_id */ fprintf(stderr, "Virtio-9p device couldn't find fsdev with the " - "id = %s\n", conf->fsdev_id ? conf->fsdev_id : "NULL"); - exit(1); + "id = %s\n", + s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL"); + return -1; } - if (!conf->tag) { + if (!s->fsconf.tag) { /* we haven't specified a mount_tag */ fprintf(stderr, "fsdev with id %s needs mount_tag arguments\n", - conf->fsdev_id); - exit(1); + s->fsconf.fsdev_id); + return -1; } s->ctx.export_flags = fse->export_flags; s->ctx.fs_root = g_strdup(fse->path); s->ctx.exops.get_st_gen = NULL; - len = strlen(conf->tag); + len = strlen(s->fsconf.tag); if (len > MAX_TAG_LEN - 1) { fprintf(stderr, "mount tag '%s' (%d bytes) is longer than " - "maximum (%d bytes)", conf->tag, len, MAX_TAG_LEN - 1); - exit(1); + "maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1); + return -1; } - s->tag = g_strdup(conf->tag); + s->tag = strdup(s->fsconf.tag); s->ctx.uid = -1; s->ops = fse->ops; @@ -117,12 +105,12 @@ static VirtIODevice *virtio_9p_common_init(DeviceState *dev, V9fsConf *conf, if (s->ops->init(&s->ctx) < 0) { fprintf(stderr, "Virtio-9p Failed to initialize fs-driver with id:%s" - " and export path:%s\n", conf->fsdev_id, s->ctx.fs_root); - exit(1); + " and export path:%s\n", s->fsconf.fsdev_id, s->ctx.fs_root); + return -1; } if (v9fs_init_worker_threads() < 0) { fprintf(stderr, "worker thread initialization failed\n"); - exit(1); + return -1; } /* @@ -134,39 +122,22 @@ static VirtIODevice *virtio_9p_common_init(DeviceState *dev, V9fsConf *conf, if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) { fprintf(stderr, "error in converting name to path %s", strerror(errno)); - exit(1); + return -1; } if (s->ops->lstat(&s->ctx, &path, &stat)) { fprintf(stderr, "share path %s does not exist\n", fse->path); - exit(1); + return -1; } else if (!S_ISDIR(stat.st_mode)) { fprintf(stderr, "share path %s is not a directory\n", fse->path); - exit(1); + return -1; } v9fs_path_free(&path); - return &s->vdev; -} - -VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) -{ - V9fsState *s = NULL; - return virtio_9p_common_init(dev, conf, &s); + return 0; } /* virtio-9p device */ -static int virtio_9p_device_init(VirtIODevice *vdev) -{ - DeviceState *qdev = DEVICE(vdev); - V9fsState *s = VIRTIO_9P(vdev); - V9fsConf *fsconf = &(s->fsconf); - if (virtio_9p_common_init(qdev, fsconf, &s) == NULL) { - return -1; - } - return 0; -} - static Property virtio_9p_properties[] = { DEFINE_VIRTIO_9P_PROPERTIES(V9fsState, fsconf), DEFINE_PROP_END_OF_LIST(),