From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 25 Mar 2010 16:22:31 +0000 (+0100)
Subject: error: New QERR_DUPLICATE_ID
X-Git-Tag: v0.13.0-rc0~776
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7bc8401712d70dc12f230fb69cdb38511fd021b1;p=qemu.git

error: New QERR_DUPLICATE_ID

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---

diff --git a/qerror.c b/qerror.c
index 4520b0d74..9fb817e7c 100644
--- a/qerror.c
+++ b/qerror.c
@@ -96,6 +96,10 @@ static const QErrorStringTable qerror_table[] = {
         .error_fmt = QERR_DEVICE_NO_BUS,
         .desc      = "Device '%(device)' has no child bus",
     },
+    {
+        .error_fmt = QERR_DUPLICATE_ID,
+        .desc      = "Duplicate ID '%(id)' for %(object)",
+    },
     {
         .error_fmt = QERR_FD_NOT_FOUND,
         .desc      = "File descriptor named '%(name)' not found",
diff --git a/qerror.h b/qerror.h
index a2664ab79..870cdc3c1 100644
--- a/qerror.h
+++ b/qerror.h
@@ -88,6 +88,9 @@ QError *qobject_to_qerror(const QObject *obj);
 #define QERR_DEVICE_NO_BUS \
     "{ 'class': 'DeviceNoBus', 'data': { 'device': %s } }"
 
+#define QERR_DUPLICATE_ID \
+    "{ 'class': 'DuplicateId', 'data': { 'id': %s, 'object': %s } }"
+
 #define QERR_FD_NOT_FOUND \
     "{ 'class': 'FdNotFound', 'data': { 'name': %s } }"