From nobody Mon Apr 29 00:01:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487013213826590.4446256383635; Mon, 13 Feb 2017 11:13:33 -0800 (PST) Received: from localhost ([::1]:59077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdM43-00062F-GE for importer@patchew.org; Mon, 13 Feb 2017 14:13:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKza-0000GQ-TR for qemu-devel@nongnu.org; Mon, 13 Feb 2017 13:04:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdKzW-000147-UN for qemu-devel@nongnu.org; Mon, 13 Feb 2017 13:04:50 -0500 Received: from mail-yb0-x241.google.com ([2607:f8b0:4002:c09::241]:36793) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdKzW-00013m-OJ for qemu-devel@nongnu.org; Mon, 13 Feb 2017 13:04:46 -0500 Received: by mail-yb0-x241.google.com with SMTP id o65so4361557ybo.3 for ; Mon, 13 Feb 2017 10:04:45 -0800 (PST) Received: from linux.local ([157.50.0.83]) by smtp.gmail.com with ESMTPSA id m29sm22243206pfi.54.2017.02.13.10.04.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Feb 2017 10:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9FxEaQg2hpeKbnylu99l81NlPL14t0o56/Xlv+cMtGU=; b=AMNJM0twm659yIVgxP5LdnNre+VpRzB2KFMtweLyjzt6WA3LUfbFMMCfPaH0M4KrBQ OFhweOE582Ok+0rPwFfs6/If3lbeoayv1RZkBKuYMkCR+YKbtyaqttbEwELZgJvZrePC 4o02Ey2KqT2vTa2nmY2P8jyc/kYarCD8soW1HwsnbIZ2OX2yY86HRDA901Yc2rLbWXVM CcFkz66H7E7vZEMd42BcH7Ly6DWNmqoMGspXFMdxp3cDlMM+1UAfQH0kKgwOC9JSZKoS s/toZ+TXxZddxP/9jX6LpQ3WM8dyaAFd++Y3NJhNRMZIHEEbkggVmwjim+MFRcjRFLnV Lvow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9FxEaQg2hpeKbnylu99l81NlPL14t0o56/Xlv+cMtGU=; b=a4tEaivOiyiiwDQcdRqHDe5EeCOAk0qKMIgHoRWff9hDp9V/KL8SABFzi1eDk1fJMm KwJcCt/VIFYvPoCt3VxWM8l/wBrmL4VStBF1S4FsmEIeZfJqu+NZzOnJSpW31XIcCEPu dPqkaQbZ/TE/Qe9O4xlas5LvQTLPKrwa/+esgtNnFzwzb0VhibZ0JiUTJRYRBUnyE1Al pkBMC96wkAO4psr6i9Cw2dyfm0EBMskfqadRRs3fiCWoi1G9emTYTXYddVaVuoK6HMD3 813u2D5rkrEsj9CEGhDJ98x0Tn5jaxzp2gOxPbwTew7Z91r6WNNfln8JdsSWJZ+dn07+ 6tXw== X-Gm-Message-State: AMke39m/t94PpoKhQtKZBtkDCuDFw0ngHVZApVhvkhAlboJiosrJTeg0UwOBT1Wkd2AwpA== X-Received: by 10.84.149.102 with SMTP id b35mr31456955plh.3.1487009084356; Mon, 13 Feb 2017 10:04:44 -0800 (PST) From: Ashijeet Acharya To: dgilbert@redhat.com Date: Mon, 13 Feb 2017 23:34:48 +0530 Message-Id: <1487009088-23891-1-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::241 Subject: [Qemu-devel] [PATCH v4] migrate: Introduce a 'dc->vmsd' check to avoid segfault for --only-migratable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pbonzini@redhat.com, qemu-devel@nongnu.org, Ashijeet Acharya , quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit a3a3d8c7 introduced a segfault bug while checking for 'dc->vmsd->unmigratable' which caused QEMU to crash when trying to add devices which do no set their 'dc->vmsd' yet while initialization. Place a 'dc->vmsd' check prior to it so that we do not segfault for such devices. NOTE: This doesn't compromise the functioning of --only-migratable option as all the unmigratable devices do set their 'dc->vmsd'. Introduce a new function check_migratable() and move the only_migratable check inside it, also use stubs to avoid user-mode qemu build failures. Signed-off-by: Ashijeet Acharya Reviewed-by: Dr. David Alan Gilbert --- Changes in v4: - introduce new check_migratable() function and use stubs Changes is v3: - move only_migratable check inside device_set_realized() to avoid code - duplication - I have dropped Juan's R-b tag for this one Changes in v2: - place dc->vmsd check in hw/usb/bus.c as well --- hw/core/qdev.c | 7 +++++++ hw/usb/bus.c | 19 ------------------- include/migration/migration.h | 3 +++ migration/migration.c | 15 +++++++++++++++ qdev-monitor.c | 9 --------- stubs/vmstate.c | 6 ++++++ 6 files changed, 31 insertions(+), 28 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 5783442..4f49cfe 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -37,6 +37,7 @@ #include "hw/boards.h" #include "hw/sysbus.h" #include "qapi-event.h" +#include "migration/migration.h" =20 int qdev_hotplug =3D 0; static bool qdev_hot_added =3D false; @@ -889,6 +890,7 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) Error *local_err =3D NULL; bool unattached_parent =3D false; static int unattached_count; + int ret; =20 if (dev->hotplugged && !dc->hotpluggable) { error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj)); @@ -896,6 +898,11 @@ static void device_set_realized(Object *obj, bool valu= e, Error **errp) } =20 if (value && !dev->realized) { + ret =3D check_migratable(obj, &local_err); + if (ret < 0) { + goto fail; + } + if (!obj->parent) { gchar *name =3D g_strdup_printf("device[%d]", unattached_count= ++); =20 diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 1dcc35c..25913ad 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -8,7 +8,6 @@ #include "monitor/monitor.h" #include "trace.h" #include "qemu/cutils.h" -#include "migration/migration.h" =20 static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent); =20 @@ -687,8 +686,6 @@ USBDevice *usbdevice_create(const char *cmdline) const char *params; int len; USBDevice *dev; - ObjectClass *klass; - DeviceClass *dc; =20 params =3D strchr(cmdline,':'); if (params) { @@ -723,22 +720,6 @@ USBDevice *usbdevice_create(const char *cmdline) return NULL; } =20 - klass =3D object_class_by_name(f->name); - if (klass =3D=3D NULL) { - error_report("Device '%s' not found", f->name); - return NULL; - } - - dc =3D DEVICE_CLASS(klass); - - if (only_migratable) { - if (dc->vmsd->unmigratable) { - error_report("Device %s is not migratable, but --only-migratab= le " - "was specified", f->name); - return NULL; - } - } - if (f->usbdevice_init) { dev =3D f->usbdevice_init(bus, params); } else { diff --git a/include/migration/migration.h b/include/migration/migration.h index af9135f..a6868cd 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -22,6 +22,7 @@ #include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" +#include "qom/object.h" =20 #define QEMU_VM_FILE_MAGIC 0x5145564d #define QEMU_VM_FILE_VERSION_COMPAT 0x00000002 @@ -305,6 +306,8 @@ int migrate_add_blocker(Error *reason, Error **errp); */ void migrate_del_blocker(Error *reason); =20 +int check_migratable(Object *obj, Error **err); + bool migrate_postcopy_ram(void); bool migrate_zero_blocks(void); =20 diff --git a/migration/migration.c b/migration/migration.c index 2766d2f..00b33f3 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1146,6 +1146,21 @@ void migrate_del_blocker(Error *reason) migration_blockers =3D g_slist_remove(migration_blockers, reason); } =20 +int check_migratable(Object *obj, Error **err) +{ + DeviceClass *dc =3D DEVICE_GET_CLASS(obj); + if (only_migratable && dc->vmsd) { + if (dc->vmsd->unmigratable) { + error_setg(err, "Device %s is not migratable, but " + "--only-migratable was specified", + object_get_typename(obj)); + return -1; + } + } + + return 0; +} + void qmp_migrate_incoming(const char *uri, Error **errp) { Error *local_err =3D NULL; diff --git a/qdev-monitor.c b/qdev-monitor.c index 549f45f..5f2fcdf 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -29,7 +29,6 @@ #include "qemu/error-report.h" #include "qemu/help_option.h" #include "sysemu/block-backend.h" -#include "migration/migration.h" =20 /* * Aliases were a bad idea from the start. Let's keep them @@ -579,14 +578,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **e= rrp) return NULL; } =20 - if (only_migratable) { - if (dc->vmsd->unmigratable) { - error_setg(errp, "Device %s is not migratable, but " - "--only-migratable was specified", driver); - return NULL; - } - } - /* find bus */ path =3D qemu_opt_get(opts, "bus"); if (path !=3D NULL) { diff --git a/stubs/vmstate.c b/stubs/vmstate.c index 6590627..5a71770 100644 --- a/stubs/vmstate.c +++ b/stubs/vmstate.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "migration/vmstate.h" +#include "migration/migration.h" =20 const VMStateDescription vmstate_dummy =3D {}; =20 @@ -18,3 +19,8 @@ void vmstate_unregister(DeviceState *dev, void *opaque) { } + +int check_migratable(Object *obj, Error **err) +{ + return 0; +} --=20 2.6.2