From patchwork Wed Aug 18 19:19:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 498949 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp979110jab; Wed, 18 Aug 2021 12:42:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVbRaS/x4SQk2TZzbvivgeabWU3+Aor6Vyd2IHFCc5iwFC7m0B3NnZi1vyagm/45pWSgv0 X-Received: by 2002:a02:7f4c:: with SMTP id r73mr9467717jac.95.1629315768036; Wed, 18 Aug 2021 12:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629315768; cv=none; d=google.com; s=arc-20160816; b=XkES6ozApw8s/udKCaY6zPtWFUiL5WpUM91x9ncVk1gpyBFVmN26zCg5HOcXdIgBvD Ew845cQjU7XYDEs3pFqn46L7H5IFMzp2Z+OAsJgwELhy7YMa5XpDbF5jASHNO022r/vP nCyqLxTewA607/lH7dhYMd4sxlMK29BER/S8efT2H3XZycyrOJqTSyyWdGfpclqUC3NX OTWNFMb8VC5Ir8nrL7BrnI5d73sPF0QWCtL7OUfanx+afaEQmBLIdFlVQjpLfpHfgF1i j2MnmRSdd9sJoG2L69oVDr0BYwdgm4ISIc6mnj35qmS0+Bi4KKy2d4xHPRkUqN99UZaT oDng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Z5NU1fcvT1VcJNTGdQrWFuzzfwQZbKI6KfWv5UH91F0=; b=U9xydguBfIpzjIVAUtDpLJ59MA3xyiMth31WA2A+fdNWWzynE5L0Zm+Gncfm/Yw0Rz +WxL9Ok6GKQ1svZaumak1d9WyTm294CQOef22CDTg+oD0qaUvDumhR0mMMXCjveres1h a6RWRq5LE0fc3q0HPq4HxmSJG6kD8lCx0K2NifpxWqVqoP7kpn3wqB9jtg1qxhzEC6Hh T298lZRQCFPxZJtmclDpYl7gczG8YmLGntystkXJwJY1//bkKpwwjvwJ4s3x3ILwgXUW AR6vjkRhm6w15auv4OoeirTfbJnRnoG/r1u2S+I+40sdAVXmRHlj9vkZrENnWpvHknS4 6Lkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H8NV6YBG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j23si558843jam.32.2021.08.18.12.42.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Aug 2021 12:42:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H8NV6YBG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGRSZ-0006Kk-6q for patch@linaro.org; Wed, 18 Aug 2021 15:42:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGR9q-0007ES-ON for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:23:26 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:33630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGR9o-0002jk-76 for qemu-devel@nongnu.org; Wed, 18 Aug 2021 15:23:26 -0400 Received: by mail-pf1-x42d.google.com with SMTP id w68so3185619pfd.0 for ; Wed, 18 Aug 2021 12:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Z5NU1fcvT1VcJNTGdQrWFuzzfwQZbKI6KfWv5UH91F0=; b=H8NV6YBGamK10dTBnfdr/B4cH8HJBaG7JzOY2Hvsy6dWE4e9Lr5tG7K/EUboBs205h zfJNYgQ5DvAdpbE6+Bv2PZZeAuUZBTwz64mC4wYNBlOwRXo5wmX5H7ExPBb0fDCpczBO dDJdzE8/HerdEb3tOIIGQNO0aaQOwwPkeE9M7bhpBApFcE9sAHyGMzX7Eq+xx5Zv/QrL KWHF10fS0rGLshStsNZwxI6NoElS5qn5zWMH+ohzrYsP7aebgm7Z4W4dkrXLls6H0IFA 38pc6Hdapcwn2iJJH6LTrNa0Q3P3JNi3hSaaTt8ingC8fQWsvQW2bkz+khWNVuqbduHT Oyrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z5NU1fcvT1VcJNTGdQrWFuzzfwQZbKI6KfWv5UH91F0=; b=JrqLSq7eHOBAaRdlTEg4flHHU9KydaVwNadk0p2mQwXuhuNLm+xVcJocmZuYTlbtt7 5GXM7yyFVJs+vm0VqASuQsRJBNMMQo7t62GtaN4kMH54/TB9yvV8mZSIicUoMdt4nqHC aFPdjIc9vpIPAwKAPJ4v0qsMa3KkBbw0aAGJumNtYPl3rRUW8eGOYYYBvL+xU4zpje67 zJeGZDlwNPuKmUdttYvYzN8UlPjTILjR2FCxP4ZdUoMDnKI/mOXJ0amXOdeOS38a/zP/ jHcj9MGMlLQaxANJCZLHpfwpIq2L0Rm+fy8uaYuDmF0xIVM50+LE4BWILqhQK5Kxi154 ESdw== X-Gm-Message-State: AOAM531AR2O6QWJgT/vOQYT58u9UbRTJdYNheqmLSx94PmLIvjACHHHb Vn3Fk+Ke6ccyuU2e7LpQwQZpOjxyzzEZWQ== X-Received: by 2002:aa7:83d0:0:b029:3c6:7261:ecb with SMTP id j16-20020aa783d00000b02903c672610ecbmr11024363pfn.61.1629314602916; Wed, 18 Aug 2021 12:23:22 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id w82sm569302pff.112.2021.08.18.12.23.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 12:23:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 48/66] hw/core/cpu: Re-sort the non-pointers to the end of CPUClass Date: Wed, 18 Aug 2021 09:19:02 -1000 Message-Id: <20210818191920.390759-49-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818191920.390759-1-richard.henderson@linaro.org> References: <20210818191920.390759-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Despite the comment, the members were not kept at the end. Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index bc864564ce..b7d5bc1200 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -131,7 +131,6 @@ struct CPUClass { ObjectClass *(*class_by_name)(const char *cpu_model); void (*parse_features)(const char *typename, char *str, Error **errp); - int reset_dump_flags; bool (*has_work)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); @@ -149,9 +148,6 @@ struct CPUClass { void (*disas_set_info)(CPUState *cpu, disassemble_info *info); const char *deprecation_note; - /* Keep non-pointer data at the end to minimize holes. */ - int gdb_num_core_regs; - bool gdb_stop_before_watchpoint; struct AccelCPUClass *accel_cpu; /* when system emulation is not available, this pointer is NULL */ @@ -165,6 +161,13 @@ struct CPUClass { * class data that depends on the accelerator, see accel/accel-common.c. */ void (*init_accel_cpu)(struct AccelCPUClass *accel_cpu, CPUClass *cc); + + /* + * Keep non-pointer data at the end to minimize holes. + */ + int reset_dump_flags; + int gdb_num_core_regs; + bool gdb_stop_before_watchpoint; }; /*