From patchwork Thu Aug 13 13:50:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 31302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id BED59B6F31 for ; Thu, 13 Aug 2009 23:58:02 +1000 (EST) Received: from localhost ([127.0.0.1]:42883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbaoZ-0003hZ-QR for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2009 09:57:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mbai1-0000GI-5h for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mbahv-00008A-Im for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:12 -0400 Received: from [199.232.76.173] (port=33487 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mbahv-00007r-92 for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:07 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45063) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mbahu-0003Cr-L4 for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:07 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7DDp50K023161; Thu, 13 Aug 2009 09:51:05 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7DDp4QP027228; Thu, 13 Aug 2009 09:51:05 -0400 Received: from localhost (vpn-10-83.bos.redhat.com [10.16.10.83]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7DDp3OF012101; Thu, 13 Aug 2009 09:51:04 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2009 10:50:02 -0300 Message-Id: <1250171428-29308-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250171428-29308-1-git-send-email-lcapitulino@redhat.com> References: <1250171428-29308-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 03/29] Introduce QString X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QString is a high-level data type that can be used to store C strings. The following functions are available: - qstring_from_str() Create a new QString from a C string - qstring_get_str() Return a pointer to the stored string Note that qstring_get_str() is too low-level for a data type like this, but it's interesting for quick read-only accesses. Signed-off-by: Luiz Capitulino --- Makefile | 2 +- qobject.h | 1 + qstring.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qstring.h | 23 ++++++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletions(-) create mode 100644 qstring.c create mode 100644 qstring.h diff --git a/Makefile b/Makefile index e296b5b..47cc532 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o obj-y += qemu-char.o aio.o net-checksum.o savevm.o obj-y += msmouse.o ps2.o obj-y += qdev.o qdev-properties.o ssi.o -obj-y += qint.o +obj-y += qint.o qstring.o obj-$(CONFIG_BRLAPI) += baum.o obj-$(CONFIG_WIN32) += tap-win32.o diff --git a/qobject.h b/qobject.h index a5bbe61..c1bdae7 100644 --- a/qobject.h +++ b/qobject.h @@ -41,6 +41,7 @@ typedef enum { QTYPE_NONE, QTYPE_QINT, + QTYPE_QSTRING, } qtype_code; struct QObject; diff --git a/qstring.c b/qstring.c new file mode 100644 index 0000000..514931e --- /dev/null +++ b/qstring.c @@ -0,0 +1,62 @@ +/* + * QString data type. + * + * Copyright (C) 2009 Red Hat Inc. + * + * Authors: + * Luiz Capitulino + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ +#include "qobject.h" +#include "qstring.h" +#include "qemu-common.h" + +static QType qstring_type; + +/** + * qstring_from_str(): Create a new QString from a regular C string + * + * Return new reference. + */ +QString *qstring_from_str(const char *str) +{ + QString *qstring; + + qstring = qemu_malloc(sizeof(*qstring)); + qstring->string = qemu_strdup(str); + qobject_init(QOBJECT(qstring), &qstring_type); + + return qstring; +} + +/** + * qstring_get_str(): Return a pointer to the stored string. + * + * NOTE: Should be used with caution, if the object is deallocated + * this pointer becomes invalid. + */ +const char *qstring_get_str(const QString *qstring) +{ + return qstring->string; +} + +/** + * qstring_destroy_obj(): Free all memory allocated by a QString + * object + */ +static void qstring_destroy_obj(QObject *obj) +{ + QString *qs; + + assert(obj != NULL); + qs = qobject_to_qstring(obj); + qemu_free(qs->string); + qemu_free(qs); +} + +static QType qstring_type = { + .code = QTYPE_QSTRING, + .destroy = qstring_destroy_obj, +}; diff --git a/qstring.h b/qstring.h new file mode 100644 index 0000000..a031e5b --- /dev/null +++ b/qstring.h @@ -0,0 +1,23 @@ +#ifndef QSTRING_H +#define QSTRING_H + +#include "qobject.h" +#include "qemu-common.h" + +typedef struct QString { + QObject base; + char *string; +} QString; + +QString *qstring_from_str(const char *str); +const char *qstring_get_str(const QString *qstring); + +/** + * qobject_to_qstring(): Convert a QObject to a QString + */ +static inline QString *qobject_to_qstring(const QObject *obj) +{ + return container_of(obj, QString, base); +} + +#endif /* QSTRING_H */