From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cornelia Huck Subject: Re: [PATCH 1/4] s390/kvm: Handle hosts not supporting s390-virtio. Date: Thu, 9 Aug 2012 12:41:57 +0200 Message-ID: <20120809124157.582fd609@BR9GNB5Z> References: <1344351168-2568-1-git-send-email-cornelia.huck@de.ibm.com> <1344351168-2568-2-git-send-email-cornelia.huck@de.ibm.com> <50238B0D.2060604@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <50238B0D.2060604@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Archive: List-Post: To: Avi Kivity Cc: linux-s390 , Anthony Liguori , Rusty Russell , KVM , Carsten Otte , Sebastian Ott , Marcelo Tosatti , Heiko Carstens , qemu-devel , Alexander Graf , Christian Borntraeger , Martin Schwidefsky List-ID: On Thu, 09 Aug 2012 13:03:57 +0300 Avi Kivity wrote: > On 08/07/2012 05:52 PM, Cornelia Huck wrote: > > Running under a kvm host does not necessarily imply the presence of > > a page mapped above the main memory with the virtio information; > > however, the code includes a hard coded access to that page. > > > > Instead, check for the presence of the page and exit gracefully > > before we hit an addressing exception if it does not exist. > > > > /* > > * Init function for virtio > > * devices are in a single page above top of "normal" mem > > @@ -443,6 +458,12 @@ static int __init kvm_devices_init(void) > > } > > > > kvm_devices = (void *) real_memory_size; > > + if (test_devices_support() < 0) { > > + vmem_remove_mapping(real_memory_size, PAGE_SIZE); > > + root_device_unregister(kvm_root); > > + /* No error. */ > > + return 0; > > + } > > > > Cleaner to defer root_device_register() until after the mapping has been > verified. OK, will reorder.