From patchwork Thu May 3 13:34:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 156700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E6A0FB6FB7 for ; Thu, 3 May 2012 23:35:10 +1000 (EST) Received: from localhost ([::1]:54724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPwBX-0001aL-So for incoming@patchwork.ozlabs.org; Thu, 03 May 2012 09:35:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPwBM-0001Yj-3m for qemu-devel@nongnu.org; Thu, 03 May 2012 09:35:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPwBB-0004sL-38 for qemu-devel@nongnu.org; Thu, 03 May 2012 09:34:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37667 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPwBA-0004s5-Ps for qemu-devel@nongnu.org; Thu, 03 May 2012 09:34:45 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id EC69897155; Thu, 3 May 2012 15:34:42 +0200 (CEST) Mime-Version: 1.0 (Apple Message framework v1257) From: Alexander Graf In-Reply-To: <4FA27AE4.4050105@us.ibm.com> Date: Thu, 3 May 2012 15:34:39 +0200 Message-Id: <59ABF71D-B380-40F0-B00E-1F60BBB05B93@suse.de> References: <4FA27AE4.4050105@us.ibm.com> To: Anthony Liguori X-Mailer: Apple Mail (2.1257) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Paolo Bonzini , qemu-devel@nongnu.org, Christian Borntraeger Subject: Re: [Qemu-devel] [PATCH] Fix legacy device aliases for s390 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 On 03.05.2012, at 14:32, Anthony Liguori wrote: > On 05/03/2012 04:07 AM, Alexander Graf wrote: >> >> On 03.05.2012, at 11:05, Paolo Bonzini wrote: >> >>> >>>>> The usual old fix was to not even compile them in. Why are they in >>>>> the alias list in the s390 build now? >>>> >>>> Because the alias list is in target-independent code. >>>> >>>> The old fix was brittle anyway, it dependent on the fact that >>>> virtio-blk-pci was not part of libhw. A similar trick broke for >>>> cirrus-vga when it became part of libhw. >>>> >>>> Christian fix is correct. >>> >>> Uhm, Christian fix would have the same problem actually if >>> virtio-*-pci were to be moved in libhw. IIRC I proposed the >>> same change on review and Anthony nacked it on these grounds. >>> You could move the alias list to target-dependent code, though. >> >> Can't we just make the virtio-*-pci variants fail instantiation and based on that search the list on? > > No, but you could do: Ah, nice. Here is a fixed (and tested) version: diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index dc4e4e1..f7a03fe 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -20,6 +20,7 @@ #include "qdev.h" #include "monitor.h" #include "qmp-commands.h" +#include "arch_init.h" /* * Aliases were a bad idea from the start. Let's keep them @@ -29,16 +30,18 @@ typedef struct QDevAlias { const char *typename; const char *alias; + uint32_t arch_mask; } QDevAlias; static const QDevAlias qdev_alias_table[] = { - { "virtio-blk-pci", "virtio-blk" }, - { "virtio-net-pci", "virtio-net" }, - { "virtio-serial-pci", "virtio-serial" }, - { "virtio-balloon-pci", "virtio-balloon" }, - { "virtio-blk-s390", "virtio-blk" }, - { "virtio-net-s390", "virtio-net" }, - { "virtio-serial-s390", "virtio-serial" }, + { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-balloon-pci", "virtio-balloon", + QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-blk-s390", "virtio-blk", QEMU_ARCH_S390X }, + { "virtio-net-s390", "virtio-net", QEMU_ARCH_S390X }, + { "virtio-serial-s390", "virtio-serial", QEMU_ARCH_S390X }, { "lsi53c895a", "lsi" }, { "ich9-ahci", "ahci" }, { } @@ -50,6 +53,11 @@ static const char *qdev_class_get_alias(DeviceClass *dc) int i; for (i = 0; qdev_alias_table[i].typename; i++) { + if (qdev_alias_table[i].arch_mask && + !(qdev_alias_table[i].arch_mask & arch_type)) { + continue; + } + if (strcmp(qdev_alias_table[i].typename, typename) == 0) { return qdev_alias_table[i].alias; } @@ -110,6 +118,11 @@ static const char *find_typename_by_alias(const char *alias) int i; for (i = 0; qdev_alias_table[i].alias; i++) { + if (qdev_alias_table[i].arch_mask && + !(qdev_alias_table[i].arch_mask & arch_type)) { + continue; + } + if (strcmp(qdev_alias_table[i].alias, alias) == 0) { return qdev_alias_table[i].typename; }