From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK2QO-00056A-P4 for qemu-devel@nongnu.org; Thu, 12 Sep 2013 04:38:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VK2QH-00019B-CW for qemu-devel@nongnu.org; Thu, 12 Sep 2013 04:38:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK2QH-00018r-2p for qemu-devel@nongnu.org; Thu, 12 Sep 2013 04:38:45 -0400 Message-ID: <1378975131.2186.20.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Thu, 12 Sep 2013 11:38:51 +0300 In-Reply-To: <5231721D.4000109@redhat.com> References: <1378924006-14057-1-git-send-email-marcel.a@redhat.com> <5231721D.4000109@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qdev-monitor: Avoid exiting when hot-plugging two devices with the same bootindex value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: sw@weilnetz.de, aliguori@us.ibm.com, qemu-devel@nongnu.org, afaerber@suse.de On Thu, 2013-09-12 at 09:49 +0200, Paolo Bonzini wrote: > Il 11/09/2013 20:26, Marcel Apfelbaum ha scritto: > > Qemu is expected to quit if the same boot index value is used by two devices. > > However, hot-plugging a device with a bootindex value already used should > > fail with a friendly message rather than quitting a running VM. > > I think the problem is right where QEMU exits, i.e. in > add_boot_device_path. This function should return an error instead, via > an Error ** argument. > > Callers, typically a device's init or realize function, will either > print the error before returning an error code (e.g. -EBUSY for init) or > propagate the error up (for realize). Thanks, I'll try this. Marcel > Returning/propagating failure will still cause QEMU to exit when the > duplicate bootindexes are found on the command line. > > Paolo > > > Signed-off-by: Marcel Apfelbaum > > --- > > qdev-monitor.c | 33 +++++++++++++++++++++++++++++++++ > > 1 file changed, 33 insertions(+) > > > > diff --git a/qdev-monitor.c b/qdev-monitor.c > > index 410cdcb..654d086 100644 > > --- a/qdev-monitor.c > > +++ b/qdev-monitor.c > > @@ -24,6 +24,7 @@ > > #include "qmp-commands.h" > > #include "sysemu/arch_init.h" > > #include "qemu/config-file.h" > > +#include "sysemu/sysemu.h" > > > > /* > > * Aliases were a bad idea from the start. Let's keep them > > @@ -442,6 +443,31 @@ static BusState *qbus_find(const char *path) > > } > > } > > > > +#define OBJ_PROP_BOOTINDEX "bootindex" > > + > > +static bool bootindex_colision(Object *obj, QemuOpts *opts) > > +{ > > + int32_t bootindex; > > + > > + if (!object_property_find(obj, OBJ_PROP_BOOTINDEX, NULL)) { > > + return false; > > + } > > + > > + /* avoid parsing by setting the property and then getting it typed */ > > + object_property_parse(obj, qemu_opt_get(opts, OBJ_PROP_BOOTINDEX), > > + OBJ_PROP_BOOTINDEX, NULL); > > + bootindex = (int32_t)object_property_get_int(obj, OBJ_PROP_BOOTINDEX, > > + NULL); > > + > > + if (bootindex >= 0) { > > + if (get_boot_device(bootindex)) { > > + return true; > > + } > > + } > > + > > + return false; > > +} > > + > > DeviceState *qdev_device_add(QemuOpts *opts) > > { > > ObjectClass *obj; > > @@ -502,6 +528,13 @@ DeviceState *qdev_device_add(QemuOpts *opts) > > /* create device, set properties */ > > qdev = DEVICE(object_new(driver)); > > > > + if (qdev_hotplug && bootindex_colision(OBJECT(qdev), opts)) { > > + qerror_report(QERR_INVALID_PARAMETER_VALUE, > > + "bootindex", "an unused boot index value"); > > + qdev_free(qdev); > > + return NULL; > > + } > > + > > if (bus) { > > qdev_set_parent_bus(qdev, bus); > > } > > >