From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C880C433E0 for ; Thu, 18 Mar 2021 10:26:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 816C064E89 for ; Thu, 18 Mar 2021 10:26:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 816C064E89 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMpre-0004gI-CJ for qemu-devel@archiver.kernel.org; Thu, 18 Mar 2021 06:26:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMpqV-0003jJ-HH for qemu-devel@nongnu.org; Thu, 18 Mar 2021 06:25:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMpqT-0002gc-SO for qemu-devel@nongnu.org; Thu, 18 Mar 2021 06:25:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616063136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1Gmw/wmb9xtgM4BL9q/Ndd34lkT89rh2IawLRz8MldE=; b=CoOshQfxu0Uyy4eX5p1zRtJZWac5twb/J2sL83qcJ/kghEmiZpaNi5bg4czGkoA6qVKxrS OYovJs7NpwRHU2c7sYoVW0ht8flSLL7S1UYsvQ7a811sedHDvSJUMYomrSIFK9vvNXaOPp 1Ob5iyJ3L95YANoEnUNj3c9Z9QWHoyI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20-z7QsHAMDMoyMlZK3cAPR5g-1; Thu, 18 Mar 2021 06:25:32 -0400 X-MC-Unique: z7QsHAMDMoyMlZK3cAPR5g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C65C481744F; Thu, 18 Mar 2021 10:25:31 +0000 (UTC) Received: from work-vm (ovpn-115-13.ams2.redhat.com [10.36.115.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A4CBC5D9C6; Thu, 18 Mar 2021 10:25:30 +0000 (UTC) Date: Thu, 18 Mar 2021 10:25:28 +0000 From: "Dr. David Alan Gilbert" To: Peter Maydell Subject: Re: of AVR target page size Message-ID: References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Richard Henderson , Michael Rolnik , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Peter Maydell (peter.maydell@linaro.org) wrote: > On Thu, 18 Mar 2021 at 10:18, Dr. David Alan Gilbert > wrote: > > diff --git a/migration/ram.c b/migration/ram.c > > index 1ee7ff9c6d..f053d45f3c 100644 > > --- a/migration/ram.c > > +++ b/migration/ram.c > > @@ -81,6 +81,8 @@ > > /* 0x80 is reserved in migration.h start with 0x100 next */ > > #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 > > > > +#define RAM_SAVE_FLAG__MAX RAM_SAVE_FLAG_COMPRESS_PAGE > > + > > static inline bool is_zero_range(uint8_t *p, uint64_t size) > > { > > return buffer_is_zero(p, size); > > @@ -4101,5 +4103,10 @@ static SaveVMHandlers savevm_ram_handlers = { > > void ram_mig_init(void) > > { > > qemu_mutex_init(&XBZRLE.lock); > > +#ifndef TARGET_PAGE_BITS_VARY > > + QEMU_BUILD_BUG_ON(RAM_SAVE_FLAG__MAX >= TARGET_PAGE_SIZE); > > +#else > > + QEMU_BUILD_BUG_ON(RAM_SAVE_FLAG__MAX >= (1 << TARGET_PAGE_BITS_MIN)); > > +#endif > > You should just be able to check against TARGET_PAGE_BITS_MIN; > we set that for both the TARGET_PAGE_BITS_VARY and the don't-vary > case. Oh yes, just: diff --git a/migration/ram.c b/migration/ram.c index 52537f14ac..a7269955b5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -81,6 +81,8 @@ /* 0x80 is reserved in migration.h start with 0x100 next */ #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 +#define RAM_SAVE_FLAG__MAX RAM_SAVE_FLAG_COMPRESS_PAGE + static inline bool is_zero_range(uint8_t *p, uint64_t size) { return buffer_is_zero(p, size); @@ -4090,5 +4092,6 @@ static SaveVMHandlers savevm_ram_handlers = { void ram_mig_init(void) { qemu_mutex_init(&XBZRLE.lock); + QEMU_BUILD_BUG_ON(RAM_SAVE_FLAG__MAX >= (1 << TARGET_PAGE_BITS_MIN)); register_savevm_live("ram", 0, 4, &savevm_ram_handlers, &ram_state); } works; lets keep that in mind somewhere after Michael fixes AVR. Dave > thanks > -- PMM > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK