From patchwork Tue Jan 4 19:37:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 77522 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 ozlabs.org (Postfix) with ESMTPS id BDA4DB7109 for ; Wed, 5 Jan 2011 06:44:00 +1100 (EST) Received: from localhost ([127.0.0.1]:56058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaCnS-0003Ny-Sh for incoming@patchwork.ozlabs.org; Tue, 04 Jan 2011 14:43:54 -0500 Received: from [140.186.70.92] (port=59204 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaChd-0000It-EM for qemu-devel@nongnu.org; Tue, 04 Jan 2011 14:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PaChc-0004WO-BC for qemu-devel@nongnu.org; Tue, 04 Jan 2011 14:37:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PaChc-0004WG-3e for qemu-devel@nongnu.org; Tue, 04 Jan 2011 14:37:52 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p04Jbpfa029306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 4 Jan 2011 14:37:51 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p04Jbouk003780; Tue, 4 Jan 2011 14:37:50 -0500 From: Alex Williamson To: qemu-devel@nongnu.org Date: Tue, 04 Jan 2011 12:37:50 -0700 Message-ID: <20110104193743.1909.65407.stgit@s20.home> In-Reply-To: <20110104192739.1909.73162.stgit@s20.home> References: <20110104192739.1909.73162.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, mst@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [RESEND PATCH 1/2] qdev: Track runtime machine modifications 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 Create a trivial interface to track whether the machine has been modified since boot. Adding or removing devices will trigger this to return true. An example usage scenario for such an interface is the rtl8139 driver which includes a cpu_register_io_memory() value in it's migration stream. For the majority of migrations, where no hotplug has occured in the machine, this works correctly. Once the machine is modified, we can use this interface to detect that and include a subsection for the device to prevent migrations to rtl8139 versions with this bug. Signed-off-by: Alex Williamson Acked-by: Michael S. Tsirkin Acked-by: Juan Quintela --- hw/qdev.c | 10 ++++++++++ hw/qdev.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 6fc9b02..e450c21 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -32,6 +32,8 @@ #include "blockdev.h" static int qdev_hotplug = 0; +static bool qdev_hot_added = false; +static bool qdev_hot_removed = false; /* This is a nasty hack to allow passing a NULL bus to qdev_create. */ static BusState *main_system_bus; @@ -93,6 +95,7 @@ static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info) if (qdev_hotplug) { assert(bus->allow_hotplug); dev->hotplugged = 1; + qdev_hot_added = true; } dev->instance_id_alias = -1; dev->state = DEV_STATE_CREATED; @@ -294,6 +297,8 @@ int qdev_unplug(DeviceState *dev) } assert(dev->info->unplug != NULL); + qdev_hot_removed = true; + return dev->info->unplug(dev); } @@ -394,6 +399,11 @@ void qdev_machine_creation_done(void) qdev_hotplug = 1; } +bool qdev_machine_modified(void) +{ + return qdev_hot_added || qdev_hot_removed; +} + /* Get a character (serial) device interface. */ CharDriverState *qdev_init_chardev(DeviceState *dev) { diff --git a/hw/qdev.h b/hw/qdev.h index aaaf55a..273bbac 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -132,6 +132,7 @@ int qdev_unplug(DeviceState *dev); void qdev_free(DeviceState *dev); int qdev_simple_unplug_cb(DeviceState *dev); void qdev_machine_creation_done(void); +bool qdev_machine_modified(void); qemu_irq qdev_get_gpio_in(DeviceState *dev, int n); void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);