From patchwork Fri Jul 14 15:13:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 788586 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 3x8GVr0yvLz9s76 for ; Sat, 15 Jul 2017 01:16:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QoLhIOtt"; dkim-atps=neutral Received: from localhost ([::1]:38491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW2KY-0001Fx-7G for incoming@patchwork.ozlabs.org; Fri, 14 Jul 2017 11:16:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW2HY-0006T2-TG for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW2HX-0001uO-GH for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:13:28 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:36308) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dW2HX-0001ts-9S for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:13:27 -0400 Received: by mail-wr0-x22a.google.com with SMTP id v60so2628636wrc.3 for ; Fri, 14 Jul 2017 08:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9MGQKTnIua+43oxvS9PdpwpS+EzwWxs4U7U1XYZ0EQc=; b=QoLhIOttvPc96gcbeN8jUYyhLj3QIQQXy2EBl/TWyIDLB+aMlr6e4TNXndjgjiT6Co MPkT5BTOKfTYV6K9dm8j4tgh0XRrWWCKMhH9IFRqDWjSGsLrMrubBJsDLZQo8ThMcwwe 2neFEZTNOTh1omvkyEZAA+3Tjdz4lUlSw8Fac= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=9MGQKTnIua+43oxvS9PdpwpS+EzwWxs4U7U1XYZ0EQc=; b=IfTivyL2V8RJ74wQjz13tkfSD328LLZHm/V1qIgZfOq1xMje2L1Evoa1jB9/mNuFnd eSgaXljQJqV0ImOMXgJkQ2Y8zIOQVCqt8rbeyX9qq873D2eFH7/b4HlVZ1+DnLDG04DB RLTrUMeqUUGYh7xs5cy9VKGh2XpP2lYOS/gljE0iEitN+H6zmDfW/f5zt+hskCrKnR46 wASzAgLEgdaxPv2ii5MYRNshp3BnboOAm/T84sz3CP/qjfOEGPt7Zzv9XqaSifLWeaGt sRDEMAFGJduitYSs7FKoXYjr2eG2RMJWKjK+pHJXBldW8kySZtrT9c/CcJq2zBychPnW rahw== X-Gm-Message-State: AIVw113QjqqTDzPDL6xCOnWgKUqZPzQOffQcDFVuLFpISHTu8B2u/mVu UV+RC7ZCMQljhiTCC08ENAXXBj1K2yXt X-Received: by 10.223.172.86 with SMTP id v80mr5675372wrc.112.1500045206133; Fri, 14 Jul 2017 08:13:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.223.134.2 with HTTP; Fri, 14 Jul 2017 08:13:05 -0700 (PDT) In-Reply-To: <20170714061521.28300-1-david@gibson.dropbear.id.au> References: <20170714061521.28300-1-david@gibson.dropbear.id.au> From: Peter Maydell Date: Fri, 14 Jul 2017 16:13:05 +0100 Message-ID: To: David Gibson X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22a Subject: Re: [Qemu-devel] [PULL 00/18] ppc-for-2.10 queue 20170714 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: Laurent Vivier , Alexander Graf , QEMU Developers , sbobroff@au1.ibm.com, Michael Roth , Greg Kurz , "qemu-ppc@nongnu.org" , Suraj Jitindar Singh Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On 14 July 2017 at 07:15, David Gibson wrote: > The following changes since commit 49bcce4b9c11759678fd223aefb48691c4959d4f: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging (2017-07-13 16:56:06 +0100) > > are available in the git repository at: > > git://github.com/dgibson/qemu.git tags/ppc-for-2.10-20170714 > > for you to fetch changes up to e11134d2ac7744569d7c387102368c507d340c30: > > pseries: Allow HPT resizing with KVM (2017-07-14 09:28:30 +1000) > > ---------------------------------------------------------------- > ppc patch queue 2017-07-14 > > Two major batches in this set, rather than the usual collection of > assorted fixes. > > * More DRC cleanup. This gets the state management into a state > which should fix many of the hotplug+migration problems we've > had. Plus it gets the migration stream format into something > well defined and pretty minimal which we can reasonably support > into the future. > > * Hashed Page Table resizing. It's been a while since this was > posted, but it's been through several previous rounds of review. > The kernel parts (both guest and host) are merged in 4.11, so > this is the only remaining piece left to allow resizing of the > HPT in a running guest. > > There are also a handful of unrelated fixes. Hi. I'm afraid this fails to build on the w32 compiler: CC ppc64-softmmu/hw/ppc/spapr.o /home/petmay01/linaro/qemu-for-merges/hw/ppc/spapr.c: In function ‘spapr_get_resize_hpt’: /home/petmay01/linaro/qemu-for-merges/hw/ppc/spapr.c:2642:1: error: control reaches end of non-void functio n [-Werror=return-type] } ^ The compiler is confused (it doesn't realise that "assert(0)" cannot return), but you can make it happier like this: static void spapr_set_resize_hpt(Object *obj, const char *value, Error **errp) I think g_assert_not_reached() is easier to read anyway; I always have to think for a moment about whether assert(0) or assert(1) is the "always assert" condition... thanks -- PMM diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 09b6ff0..68f936c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2638,7 +2638,7 @@ static char *spapr_get_resize_hpt(Object *obj, Error **errp) case SPAPR_RESIZE_HPT_REQUIRED: return g_strdup("required"); } - assert(0); + g_assert_not_reached(); }