From patchwork Mon Jul 14 15:49:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 369677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A26914011B for ; Tue, 15 Jul 2014 01:51:02 +1000 (EST) Received: from localhost ([::1]:58521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6iWq-0007Ta-7j for incoming@patchwork.ozlabs.org; Mon, 14 Jul 2014 11:51:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6iVr-00064K-1P for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:50:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6iVh-0002tF-UK for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:49:58 -0400 Received: from mail-qc0-x22c.google.com ([2607:f8b0:400d:c01::22c]:48058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6iVh-0002sw-QN for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:49:49 -0400 Received: by mail-qc0-f172.google.com with SMTP id l6so3733298qcy.3 for ; Mon, 14 Jul 2014 08:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=E1jYZYJdW99JeriwCA+TMnlfzFf5JF4cruWOV+i4mUY=; b=EXPn00GrhayKVw/ehQB06Uc0qLsvoIb0efkG118hiygO049PVHrYcsIpbszKj0Swr8 lRoQM9CYOfzfyQQZMeiUpyesopfG7IvvcEVgjNnrsQkKZ68JPdAoaMPSP6P17Ppxu9MD oVaOs9rx6UHjPyNJlN+MKTsY+JNz57VnATM8aqGsKmyl/TyxQa+7dFmwjFVr5dr2CcKS q3/W6hjas9XuuHNwiI2MXAZLS4MLKZvfYU1ihYq4pbO8HYagIxXuGpKOKiy4Bmz5ubcq IbmsowGOvmeCdlnqHTa5HPVsftWUZnG8x/yjeSfIS3ZQPg/Bx50y2YBk0kICHIx7peQ3 m0+w== X-Received: by 10.140.91.164 with SMTP id z33mr24536406qgd.65.1405352989439; Mon, 14 Jul 2014 08:49:49 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-116-204-163.cust.vodafonedsl.it. [37.116.204.163]) by mx.google.com with ESMTPSA id k2sm20975621qat.23.2014.07.14.08.49.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jul 2014 08:49:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 14 Jul 2014 17:49:28 +0200 Message-Id: <1405352968-3155-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405352968-3155-1-git-send-email-pbonzini@redhat.com> References: <1405352968-3155-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22c Cc: Markus Armbruster Subject: [Qemu-devel] [PULL 5/5] serial-pci: remove memory regions from BAR before destroying them X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Otherwise, hot-unplug of pci-serial-2x trips the assertion in memory_region_destroy: (qemu) device_del gg (qemu) qemu-system-x86_64: /work/armbru/tmp/qemu/memory.c:1021: memory_region_destroy: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed. Aborted (core dumped) Reported-by: Markus Armbruster Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- hw/char/serial-pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index f53bb9c..c133c33 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -148,6 +148,7 @@ static void multi_serial_pci_exit(PCIDevice *dev) for (i = 0; i < pci->ports; i++) { s = pci->state + i; serial_exit_core(s); + memory_region_del_subregion(&pci->iobar, &s->io); memory_region_destroy(&s->io); g_free(pci->name[i]); }