QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Lukas Straub <lukasstraub2@web.de>
To: qemu-devel <qemu-devel@nongnu.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-block <qemu-block@nongnu.org>,
	"Juan Quintela" <quintela@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH v6 8/9] chardev/char.c: Check for duplicate id before creating chardev
Date: Fri, 31 Jul 2020 11:27:04 +0200
Message-ID: <b6d4b5712afc095f3d315818723809a20a2de21e.1596184200.git.lukasstraub2@web.de> (raw)
In-Reply-To: <cover.1596184200.git.lukasstraub2@web.de>


[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]

yank_register_instance (called when creating the new chardev object)
aborts if the instance already exists. So check for duplicate id before
creating the new chardev to prevent this.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
 chardev/char.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/chardev/char.c b/chardev/char.c
index 77e7ec814f..ce041dface 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -951,6 +951,11 @@ static Chardev *chardev_new(const char *id, const char *typename,

     assert(g_str_has_prefix(typename, "chardev-"));

+    if (id && object_resolve_path_component(get_chardevs_root(), id)) {
+        error_setg(errp, "Chardev '%s' already exists", id);
+        return NULL;
+    }
+
     obj = object_new(typename);
     chr = CHARDEV(obj);
     chr->label = g_strdup(id);
@@ -969,11 +974,7 @@ static Chardev *chardev_new(const char *id, const char *typename,
     }

     if (id) {
-        object_property_try_add_child(get_chardevs_root(), id, obj,
-                                      &local_err);
-        if (local_err) {
-            goto end;
-        }
+        object_property_add_child(get_chardevs_root(), id, obj);
         object_unref(obj);
     }

--
2.20.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  parent reply index

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31  9:26 [PATCH v6 0/9] Introduce 'yank' oob qmp command to recover from hanging qemu Lukas Straub
2020-07-31  9:26 ` [PATCH v6 1/9] Introduce yank feature Lukas Straub
2020-07-31  9:26 ` [PATCH v6 2/9] block/nbd.c: Add " Lukas Straub
2020-07-31  9:26 ` [PATCH v6 3/9] chardev/char-socket.c: " Lukas Straub
2020-07-31  9:26 ` [PATCH v6 4/9] migration: " Lukas Straub
2020-07-31  9:26 ` [PATCH v6 5/9] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe Lukas Straub
2020-07-31  9:26 ` [PATCH v6 6/9] io: Document thread-safety of qio_channel_shutdown Lukas Straub
2020-07-31  9:27 ` [PATCH v6 7/9] MAINTAINERS: Add myself as maintainer for yank feature Lukas Straub
2020-07-31  9:27 ` Lukas Straub [this message]
2020-07-31  9:37   ` [PATCH v6 8/9] chardev/char.c: Check for duplicate id before creating chardev Daniel P. Berrangé
2020-07-31 13:29     ` Lukas Straub
2020-07-31  9:27 ` [PATCH v6 9/9] tests/test-char.c: Wait for the chardev to connect in char_socket_client_dupid_test Lukas Straub

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b6d4b5712afc095f3d315818723809a20a2de21e.1596184200.git.lukasstraub2@web.de \
    --to=lukasstraub2@web.de \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git