From patchwork Wed Sep 2 22:42:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274775 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 E6F64C433E7 for ; Wed, 2 Sep 2020 22:45:41 +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 9E24320767 for ; Wed, 2 Sep 2020 22:45:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CU3CFbtD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E24320767 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]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbVc-000546-Bq for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:45:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbTc-0000oq-9r for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:43:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbTY-0008EP-5e for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:43:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086611; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZyvrMNZ2V92BZ5e8Pz0Rtl4flkTSjlElVDCgNekwBak=; b=CU3CFbtDA5tFK/A6dtVM7OVkJGjHj2UnOT6qRtxVT9gwpXfWMtxTREG2+p0jwWQThG+Rpc jRUqVh/lZnTLY87nZ4Pe7t26nOW3qSwyIIPyuAiIRijtoyHSpfZgENI3g2AOX39TSgm5Vp hoEBmdw5AsT1X89tFRC0bjYxJY7M85Y= 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-541-EFN-0yxLOnSBhqSPCWss9w-1; Wed, 02 Sep 2020 18:43:25 -0400 X-MC-Unique: EFN-0yxLOnSBhqSPCWss9w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9372581F004; Wed, 2 Sep 2020 22:43:24 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 022E419C59; Wed, 2 Sep 2020 22:43:13 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 02/63] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV Date: Wed, 2 Sep 2020 18:42:10 -0400 Message-Id: <20200902224311.1321159-3-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: berrange@redhat.com, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , Samuel Thibault , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the TYPE_* constants consistent with the name of most type checking macros we have today. Signed-off-by: Eduardo Habkost --- Cc: Samuel Thibault Cc: "Marc-André Lureau" Cc: Paolo Bonzini Cc: "Alex Bennée" Cc: "Philippe Mathieu-Daudé" Cc: "Michael S. Tsirkin" Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- chardev/chardev-internal.h | 4 ++-- include/chardev/char-fd.h | 4 ++-- include/chardev/char-win-stdio.h | 2 +- include/chardev/char-win.h | 4 ++-- include/chardev/char.h | 30 +++++++++++++++--------------- include/chardev/spice.h | 8 ++++---- chardev/baum.c | 6 +++--- chardev/char-console.c | 4 ++-- chardev/char-fd.c | 2 +- chardev/char-file.c | 6 +++--- chardev/char-mux.c | 2 +- chardev/char-null.c | 2 +- chardev/char-parallel.c | 4 ++-- chardev/char-pipe.c | 6 +++--- chardev/char-pty.c | 4 ++-- chardev/char-ringbuf.c | 8 ++++---- chardev/char-serial.c | 6 +++--- chardev/char-socket.c | 4 ++-- chardev/char-stdio.c | 6 +++--- chardev/char-udp.c | 4 ++-- chardev/char-win-stdio.c | 4 ++-- chardev/char-win.c | 2 +- chardev/char.c | 2 +- chardev/msmouse.c | 6 +++--- chardev/spice.c | 10 +++++----- chardev/testdev.c | 6 +++--- chardev/wctablet.c | 6 +++--- gdbstub.c | 6 +++--- hw/display/vhost-user-gpu.c | 2 +- tests/test-char.c | 4 ++-- ui/console.c | 8 ++++---- ui/gtk.c | 6 +++--- ui/spice-app.c | 10 +++++----- 33 files changed, 94 insertions(+), 94 deletions(-) diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h index aba0240759..832dc10a95 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h @@ -55,9 +55,9 @@ struct MuxChardev { typedef struct MuxChardev MuxChardev; DECLARE_INSTANCE_CHECKER(MuxChardev, MUX_CHARDEV, - TYPE_CHARDEV_MUX) + TYPE_MUX_CHARDEV) #define CHARDEV_IS_MUX(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX) + object_dynamic_cast(OBJECT(chr), TYPE_MUX_CHARDEV) void mux_set_focus(Chardev *chr, int focus); void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event); diff --git a/include/chardev/char-fd.h b/include/chardev/char-fd.h index 9de0e440de..14c664fc83 100644 --- a/include/chardev/char-fd.h +++ b/include/chardev/char-fd.h @@ -36,10 +36,10 @@ struct FDChardev { }; typedef struct FDChardev FDChardev; -#define TYPE_CHARDEV_FD "chardev-fd" +#define TYPE_FD_CHARDEV "chardev-fd" DECLARE_INSTANCE_CHECKER(FDChardev, FD_CHARDEV, - TYPE_CHARDEV_FD) + TYPE_FD_CHARDEV) void qemu_chr_open_fd(Chardev *chr, int fd_in, int fd_out); int qmp_chardev_open_file_source(char *src, int flags, Error **errp); diff --git a/include/chardev/char-win-stdio.h b/include/chardev/char-win-stdio.h index d7314f734d..139dfbe92f 100644 --- a/include/chardev/char-win-stdio.h +++ b/include/chardev/char-win-stdio.h @@ -24,6 +24,6 @@ #ifndef CHAR_WIN_STDIO_H #define CHAR_WIN_STDIO_H -#define TYPE_CHARDEV_WIN_STDIO "chardev-win-stdio" +#define TYPE_WIN_STDIO_CHARDEV "chardev-win-stdio" #endif /* CHAR_WIN_STDIO_H */ diff --git a/include/chardev/char-win.h b/include/chardev/char-win.h index 485521469c..a1745ba267 100644 --- a/include/chardev/char-win.h +++ b/include/chardev/char-win.h @@ -43,9 +43,9 @@ typedef struct WinChardev WinChardev; #define NSENDBUF 2048 #define NRECVBUF 2048 -#define TYPE_CHARDEV_WIN "chardev-win" +#define TYPE_WIN_CHARDEV "chardev-win" DECLARE_INSTANCE_CHECKER(WinChardev, WIN_CHARDEV, - TYPE_CHARDEV_WIN) + TYPE_WIN_CHARDEV) void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open); int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp); diff --git a/include/chardev/char.h b/include/chardev/char.h index 5874de57ea..0f358a4eee 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -230,24 +230,24 @@ typedef struct ChardevClass ChardevClass; DECLARE_OBJ_CHECKERS(Chardev, ChardevClass, CHARDEV, TYPE_CHARDEV) -#define TYPE_CHARDEV_NULL "chardev-null" -#define TYPE_CHARDEV_MUX "chardev-mux" -#define TYPE_CHARDEV_RINGBUF "chardev-ringbuf" -#define TYPE_CHARDEV_PTY "chardev-pty" -#define TYPE_CHARDEV_CONSOLE "chardev-console" -#define TYPE_CHARDEV_STDIO "chardev-stdio" -#define TYPE_CHARDEV_PIPE "chardev-pipe" -#define TYPE_CHARDEV_MEMORY "chardev-memory" -#define TYPE_CHARDEV_PARALLEL "chardev-parallel" -#define TYPE_CHARDEV_FILE "chardev-file" -#define TYPE_CHARDEV_SERIAL "chardev-serial" -#define TYPE_CHARDEV_SOCKET "chardev-socket" -#define TYPE_CHARDEV_UDP "chardev-udp" +#define TYPE_NULL_CHARDEV "chardev-null" +#define TYPE_MUX_CHARDEV "chardev-mux" +#define TYPE_RINGBUF_CHARDEV "chardev-ringbuf" +#define TYPE_PTY_CHARDEV "chardev-pty" +#define TYPE_CONSOLE_CHARDEV "chardev-console" +#define TYPE_STDIO_CHARDEV "chardev-stdio" +#define TYPE_PIPE_CHARDEV "chardev-pipe" +#define TYPE_MEMORY_CHARDEV "chardev-memory" +#define TYPE_PARALLEL_CHARDEV "chardev-parallel" +#define TYPE_FILE_CHARDEV "chardev-file" +#define TYPE_SERIAL_CHARDEV "chardev-serial" +#define TYPE_SOCKET_CHARDEV "chardev-socket" +#define TYPE_UDP_CHARDEV "chardev-udp" #define CHARDEV_IS_RINGBUF(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_RINGBUF) + object_dynamic_cast(OBJECT(chr), TYPE_RINGBUF_CHARDEV) #define CHARDEV_IS_PTY(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_PTY) + object_dynamic_cast(OBJECT(chr), TYPE_PTY_CHARDEV) struct ChardevClass { ObjectClass parent_class; diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 99f26aedde..302573b582 100644 --- a/include/chardev/spice.h +++ b/include/chardev/spice.h @@ -17,12 +17,12 @@ struct SpiceChardev { }; typedef struct SpiceChardev SpiceChardev; -#define TYPE_CHARDEV_SPICE "chardev-spice" -#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc" -#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport" +#define TYPE_SPICE_CHARDEV "chardev-spice" +#define TYPE_SPICEVMC_CHARDEV "chardev-spicevmc" +#define TYPE_SPICEPORT_CHARDEV "chardev-spiceport" DECLARE_INSTANCE_CHECKER(SpiceChardev, SPICE_CHARDEV, - TYPE_CHARDEV_SPICE) + TYPE_SPICE_CHARDEV) void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend, bool *be_opened, Error **errp); diff --git a/chardev/baum.c b/chardev/baum.c index 5deca778bc..d6c9f698c1 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -104,9 +104,9 @@ struct BaumChardev { }; typedef struct BaumChardev BaumChardev; -#define TYPE_CHARDEV_BRAILLE "chardev-braille" +#define TYPE_BRAILLE_CHARDEV "chardev-braille" DECLARE_INSTANCE_CHECKER(BaumChardev, BAUM_CHARDEV, - TYPE_CHARDEV_BRAILLE) + TYPE_BRAILLE_CHARDEV) /* Let's assume NABCC by default */ enum way { @@ -674,7 +674,7 @@ static void char_braille_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_braille_type_info = { - .name = TYPE_CHARDEV_BRAILLE, + .name = TYPE_BRAILLE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(BaumChardev), .instance_finalize = char_braille_finalize, diff --git a/chardev/char-console.c b/chardev/char-console.c index 6c4ce5dbce..5d175389fd 100644 --- a/chardev/char-console.c +++ b/chardev/char-console.c @@ -42,8 +42,8 @@ static void char_console_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_console_type_info = { - .name = TYPE_CHARDEV_CONSOLE, - .parent = TYPE_CHARDEV_WIN, + .name = TYPE_CONSOLE_CHARDEV, + .parent = TYPE_WIN_CHARDEV, .class_init = char_console_class_init, }; diff --git a/chardev/char-fd.c b/chardev/char-fd.c index c2d8101106..031fe2a2d6 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -154,7 +154,7 @@ static void char_fd_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_fd_type_info = { - .name = TYPE_CHARDEV_FD, + .name = TYPE_FD_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(FDChardev), .instance_finalize = char_fd_finalize, diff --git a/chardev/char-file.c b/chardev/char-file.c index 2fd80707e5..fc53bdb4aa 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -124,11 +124,11 @@ static void char_file_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_file_type_info = { - .name = TYPE_CHARDEV_FILE, + .name = TYPE_FILE_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_file_class_init, }; diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 6f980bb836..8930b4d5e8 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -388,7 +388,7 @@ static void char_mux_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_mux_type_info = { - .name = TYPE_CHARDEV_MUX, + .name = TYPE_MUX_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_mux_class_init, .instance_size = sizeof(MuxChardev), diff --git a/chardev/char-null.c b/chardev/char-null.c index 1c6a2900f9..fcddd33452 100644 --- a/chardev/char-null.c +++ b/chardev/char-null.c @@ -42,7 +42,7 @@ static void char_null_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_null_type_info = { - .name = TYPE_CHARDEV_NULL, + .name = TYPE_NULL_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(Chardev), .class_init = char_null_class_init, diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index 66e4589b2b..289c1b002c 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -58,7 +58,7 @@ struct ParallelChardev { typedef struct ParallelChardev ParallelChardev; DECLARE_INSTANCE_CHECKER(ParallelChardev, PARALLEL_CHARDEV, - TYPE_CHARDEV_PARALLEL) + TYPE_PARALLEL_CHARDEV) static int pp_hw_mode(ParallelChardev *s, uint16_t mode) { @@ -303,7 +303,7 @@ static void char_parallel_finalize(Object *obj) } static const TypeInfo char_parallel_type_info = { - .name = TYPE_CHARDEV_PARALLEL, + .name = TYPE_PARALLEL_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(ParallelChardev), .instance_finalize = char_parallel_finalize, diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index fd12c9e63b..7458433256 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -179,11 +179,11 @@ static void char_pipe_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_pipe_type_info = { - .name = TYPE_CHARDEV_PIPE, + .name = TYPE_PIPE_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_pipe_class_init, }; diff --git a/chardev/char-pty.c b/chardev/char-pty.c index a2d1e7c985..9cf77596d2 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -46,7 +46,7 @@ struct PtyChardev { typedef struct PtyChardev PtyChardev; DECLARE_INSTANCE_CHECKER(PtyChardev, PTY_CHARDEV, - TYPE_CHARDEV_PTY) + TYPE_PTY_CHARDEV) static void pty_chr_state(Chardev *chr, int connected); @@ -240,7 +240,7 @@ static void char_pty_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_pty_type_info = { - .name = TYPE_CHARDEV_PTY, + .name = TYPE_PTY_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(PtyChardev), .instance_finalize = char_pty_finalize, diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index d40d21d3cf..edeb7daeae 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -43,7 +43,7 @@ struct RingBufChardev { typedef struct RingBufChardev RingBufChardev; DECLARE_INSTANCE_CHECKER(RingBufChardev, RINGBUF_CHARDEV, - TYPE_CHARDEV_RINGBUF) + TYPE_RINGBUF_CHARDEV) static size_t ringbuf_count(const Chardev *chr) { @@ -233,7 +233,7 @@ static void char_ringbuf_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_ringbuf_type_info = { - .name = TYPE_CHARDEV_RINGBUF, + .name = TYPE_RINGBUF_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_ringbuf_class_init, .instance_size = sizeof(RingBufChardev), @@ -242,8 +242,8 @@ static const TypeInfo char_ringbuf_type_info = { /* Bug-compatibility: */ static const TypeInfo char_memory_type_info = { - .name = TYPE_CHARDEV_MEMORY, - .parent = TYPE_CHARDEV_RINGBUF, + .name = TYPE_MEMORY_CHARDEV, + .parent = TYPE_RINGBUF_CHARDEV, }; static void register_types(void) diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 7c3d84ae24..381107bd89 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -308,11 +308,11 @@ static void char_serial_class_init(ObjectClass *oc, void *data) static const TypeInfo char_serial_type_info = { - .name = TYPE_CHARDEV_SERIAL, + .name = TYPE_SERIAL_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_serial_class_init, }; diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 95e45812d5..bb5ddc586c 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -89,7 +89,7 @@ struct SocketChardev { typedef struct SocketChardev SocketChardev; DECLARE_INSTANCE_CHECKER(SocketChardev, SOCKET_CHARDEV, - TYPE_CHARDEV_SOCKET) + TYPE_SOCKET_CHARDEV) static gboolean socket_reconnect_timeout(gpointer opaque); static void tcp_chr_telnet_init(Chardev *chr); @@ -1506,7 +1506,7 @@ static void char_socket_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_socket_type_info = { - .name = TYPE_CHARDEV_SOCKET, + .name = TYPE_SOCKET_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(SocketChardev), .instance_finalize = char_socket_finalize, diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 82eaebc1db..fb28eaeb87 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -150,11 +150,11 @@ static void char_stdio_finalize(Object *obj) } static const TypeInfo char_stdio_type_info = { - .name = TYPE_CHARDEV_STDIO, + .name = TYPE_STDIO_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN_STDIO, + .parent = TYPE_WIN_STDIO_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .instance_finalize = char_stdio_finalize, .class_init = char_stdio_class_init, diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 16b5dbce58..6d7b9d2805 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -46,7 +46,7 @@ struct UdpChardev { typedef struct UdpChardev UdpChardev; DECLARE_INSTANCE_CHECKER(UdpChardev, UDP_CHARDEV, - TYPE_CHARDEV_UDP) + TYPE_UDP_CHARDEV) /* Called with chr_write_lock held. */ static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len) @@ -231,7 +231,7 @@ static void char_udp_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_udp_type_info = { - .name = TYPE_CHARDEV_UDP, + .name = TYPE_UDP_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(UdpChardev), .instance_finalize = char_udp_finalize, diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c index a4771ab82e..f333b8cedc 100644 --- a/chardev/char-win-stdio.c +++ b/chardev/char-win-stdio.c @@ -41,7 +41,7 @@ struct WinStdioChardev { typedef struct WinStdioChardev WinStdioChardev; DECLARE_INSTANCE_CHECKER(WinStdioChardev, WIN_STDIO_CHARDEV, - TYPE_CHARDEV_WIN_STDIO) + TYPE_WIN_STDIO_CHARDEV) static void win_stdio_wait_func(void *opaque) { @@ -255,7 +255,7 @@ static void char_win_stdio_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_win_stdio_type_info = { - .name = TYPE_CHARDEV_WIN_STDIO, + .name = TYPE_WIN_STDIO_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(WinStdioChardev), .instance_finalize = char_win_stdio_finalize, diff --git a/chardev/char-win.c b/chardev/char-win.c index d4fb44c4dc..69dcf48873 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -228,7 +228,7 @@ static void char_win_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_win_type_info = { - .name = TYPE_CHARDEV_WIN, + .name = TYPE_WIN_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(WinChardev), .instance_finalize = char_win_finalize, diff --git a/chardev/char.c b/chardev/char.c index 77e7ec814f..afebdc345e 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -674,7 +674,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, GMainContext *context, backend->type = CHARDEV_BACKEND_KIND_MUX; backend->u.mux.data = g_new0(ChardevMux, 1); backend->u.mux.data->chardev = g_strdup(bid); - mux = qemu_chardev_new(id, TYPE_CHARDEV_MUX, backend, context, errp); + mux = qemu_chardev_new(id, TYPE_MUX_CHARDEV, backend, context, errp); if (mux == NULL) { object_unparent(OBJECT(chr)); chr = NULL; diff --git a/chardev/msmouse.c b/chardev/msmouse.c index eb9231dcdb..4033ca714d 100644 --- a/chardev/msmouse.c +++ b/chardev/msmouse.c @@ -44,9 +44,9 @@ struct MouseChardev { }; typedef struct MouseChardev MouseChardev; -#define TYPE_CHARDEV_MSMOUSE "chardev-msmouse" +#define TYPE_MSMOUSE_CHARDEV "chardev-msmouse" DECLARE_INSTANCE_CHECKER(MouseChardev, MOUSE_CHARDEV, - TYPE_CHARDEV_MSMOUSE) + TYPE_MSMOUSE_CHARDEV) static void msmouse_chr_accept_input(Chardev *chr) { @@ -178,7 +178,7 @@ static void char_msmouse_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_msmouse_type_info = { - .name = TYPE_CHARDEV_MSMOUSE, + .name = TYPE_MSMOUSE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(MouseChardev), .instance_finalize = char_msmouse_finalize, diff --git a/chardev/spice.c b/chardev/spice.c index bf7ea1e294..7423001b71 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -376,7 +376,7 @@ static void char_spice_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spice_type_info = { - .name = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(SpiceChardev), .instance_finalize = char_spice_finalize, @@ -394,8 +394,8 @@ static void char_spicevmc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spicevmc_type_info = { - .name = TYPE_CHARDEV_SPICEVMC, - .parent = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICEVMC_CHARDEV, + .parent = TYPE_SPICE_CHARDEV, .class_init = char_spicevmc_class_init, }; @@ -409,8 +409,8 @@ static void char_spiceport_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spiceport_type_info = { - .name = TYPE_CHARDEV_SPICEPORT, - .parent = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICEPORT_CHARDEV, + .parent = TYPE_SPICE_CHARDEV, .class_init = char_spiceport_class_init, }; diff --git a/chardev/testdev.c b/chardev/testdev.c index a92caca3c3..5ef9a59817 100644 --- a/chardev/testdev.c +++ b/chardev/testdev.c @@ -39,9 +39,9 @@ struct TestdevChardev { }; typedef struct TestdevChardev TestdevChardev; -#define TYPE_CHARDEV_TESTDEV "chardev-testdev" +#define TYPE_TESTDEV_CHARDEV "chardev-testdev" DECLARE_INSTANCE_CHECKER(TestdevChardev, TESTDEV_CHARDEV, - TYPE_CHARDEV_TESTDEV) + TYPE_TESTDEV_CHARDEV) /* Try to interpret a whole incoming packet */ static int testdev_eat_packet(TestdevChardev *testdev) @@ -118,7 +118,7 @@ static void char_testdev_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_testdev_type_info = { - .name = TYPE_CHARDEV_TESTDEV, + .name = TYPE_TESTDEV_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(TestdevChardev), .class_init = char_testdev_class_init, diff --git a/chardev/wctablet.c b/chardev/wctablet.c index 95e005f5a5..2cc018efb3 100644 --- a/chardev/wctablet.c +++ b/chardev/wctablet.c @@ -85,9 +85,9 @@ struct TabletChardev { }; typedef struct TabletChardev TabletChardev; -#define TYPE_CHARDEV_WCTABLET "chardev-wctablet" +#define TYPE_WCTABLET_CHARDEV "chardev-wctablet" DECLARE_INSTANCE_CHECKER(TabletChardev, WCTABLET_CHARDEV, - TYPE_CHARDEV_WCTABLET) + TYPE_WCTABLET_CHARDEV) static void wctablet_chr_accept_input(Chardev *chr); @@ -352,7 +352,7 @@ static void wctablet_chr_class_init(ObjectClass *oc, void *data) } static const TypeInfo wctablet_type_info = { - .name = TYPE_CHARDEV_WCTABLET, + .name = TYPE_WCTABLET_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(TabletChardev), .instance_finalize = wctablet_chr_finalize, diff --git a/gdbstub.c b/gdbstub.c index 9dfb6e4142..7afdcf0f37 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3301,10 +3301,10 @@ static void char_gdb_class_init(ObjectClass *oc, void *data) cc->chr_write = gdb_monitor_write; } -#define TYPE_CHARDEV_GDB "chardev-gdb" +#define TYPE_GDB_CHARDEV "chardev-gdb" static const TypeInfo char_gdb_type_info = { - .name = TYPE_CHARDEV_GDB, + .name = TYPE_GDB_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_gdb_class_init, }; @@ -3409,7 +3409,7 @@ int gdbserver_start(const char *device) qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL); /* Initialize a monitor terminal for gdb */ - mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, + mon_chr = qemu_chardev_new(NULL, TYPE_GDB_CHARDEV, NULL, NULL, &error_abort); monitor_init_hmp(mon_chr, false, &error_abort); } else { diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 51f1747c4a..f656fb38a7 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -388,7 +388,7 @@ vhost_user_gpu_do_set_socket(VhostUserGPU *g, Error **errp) return false; } - chr = CHARDEV(object_new(TYPE_CHARDEV_SOCKET)); + chr = CHARDEV(object_new(TYPE_SOCKET_CHARDEV)); if (!chr || qemu_chr_add_client(chr, sv[0]) == -1) { error_setg(errp, "Failed to make socket chardev"); goto err; diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..2b2135ec77 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1232,7 +1232,7 @@ static void char_file_fifo_test(void) ret = write(fd, "fifo-in", 8); g_assert_cmpint(ret, ==, 8); - chr = qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, + chr = qemu_chardev_new("label-file", TYPE_FILE_CHARDEV, &backend, NULL, &error_abort); qemu_chr_fe_init(&be, chr, &error_abort); @@ -1286,7 +1286,7 @@ static void char_file_test_internal(Chardev *ext_chr, const char *filepath) } else { out = g_build_filename(tmp_path, "out", NULL); file.out = out; - chr = qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + chr = qemu_chardev_new(NULL, TYPE_FILE_CHARDEV, &backend, NULL, &error_abort); } ret = qemu_chr_write_all(chr, (uint8_t *)"hello!", 6); diff --git a/ui/console.c b/ui/console.c index f8d7643fe4..965f01e804 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1089,9 +1089,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) static int vc_chr_write(Chardev *chr, const uint8_t *buf, int len) { @@ -2403,7 +2403,7 @@ static void char_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_vc_type_info = { - .name = TYPE_CHARDEV_VC, + .name = TYPE_VC_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_vc_class_init, @@ -2412,7 +2412,7 @@ static const TypeInfo char_vc_type_info = { void qemu_console_early_init(void) { /* set the default vc driver */ - if (!object_class_by_name(TYPE_CHARDEV_VC)) { + if (!object_class_by_name(TYPE_VC_CHARDEV)) { type_register(&char_vc_type_info); } } diff --git a/ui/gtk.c b/ui/gtk.c index d28d7545d3..ecaa9527fc 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -178,9 +178,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) bool gtk_use_gl_area; @@ -1717,7 +1717,7 @@ static void char_gd_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_gd_vc_type_info = { - .name = TYPE_CHARDEV_VC, + .name = TYPE_VC_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_gd_vc_class_init, diff --git a/ui/spice-app.c b/ui/spice-app.c index 93e105c6ee..e69dc21c78 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -46,9 +46,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) static ChardevBackend * chr_spice_backend_new(void) @@ -99,8 +99,8 @@ static void char_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_vc_type_info = { - .name = TYPE_CHARDEV_VC, - .parent = TYPE_CHARDEV_SPICEPORT, + .name = TYPE_VC_CHARDEV, + .parent = TYPE_SPICEPORT_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_vc_class_init, }; @@ -166,7 +166,7 @@ static void spice_app_display_early_init(DisplayOptions *opts) display_opengl = opts->has_gl; #endif be->u.spiceport.data->fqdn = g_strdup("org.qemu.monitor.qmp.0"); - qemu_chardev_new("org.qemu.monitor.qmp", TYPE_CHARDEV_SPICEPORT, + qemu_chardev_new("org.qemu.monitor.qmp", TYPE_SPICEPORT_CHARDEV, be, NULL, &error_abort); qopts = qemu_opts_create(qemu_find_opts("mon"), NULL, 0, &error_fatal); From patchwork Wed Sep 2 22:42:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274773 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 02401C433E2 for ; Wed, 2 Sep 2020 22:47:56 +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 A545720767 for ; Wed, 2 Sep 2020 22:47:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SjRNOa5r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A545720767 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]:56598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbXm-0000or-Pi for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:47:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbTx-0001cS-QG for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:43:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbTv-0008JD-Rg for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:43:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086635; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I5oINIvJ6g0gJtBhiodyhTj34EeSSzAlhxZdmmgOA5c=; b=SjRNOa5rqIg3J60zq2nt3nnWwwZY4VgCd2CE7OXXioqwJX5jZCCDqOO3HqKUqsWMkJvPrw 8ktJMqUpPShR/muGQRDc/qKjacjG50h1daMoWIm5pwXsZ9vn7VTNbWf+LoSj5ThfgxPR9x b+2A35Sfus45mlBnnffDgOqs/romhY8= 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-243-ZOXGs3vEN9WrMvlSIIWtyw-1; Wed, 02 Sep 2020 18:43:53 -0400 X-MC-Unique: ZOXGs3vEN9WrMvlSIIWtyw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FF331DE00 for ; Wed, 2 Sep 2020 22:43:52 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 168571C4; Wed, 2 Sep 2020 22:43:49 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 09/63] vmcoreinfo: Rename VMCOREINFO_DEVICE to TYPE_VMCOREINFO Date: Wed, 2 Sep 2020 18:42:17 -0400 Message-Id: <20200902224311.1321159-10-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: "Marc-André Lureau" Cc: qemu-devel@nongnu.org --- include/hw/misc/vmcoreinfo.h | 6 +++--- hw/misc/vmcoreinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h index ebada6617a..6e523c3892 100644 --- a/include/hw/misc/vmcoreinfo.h +++ b/include/hw/misc/vmcoreinfo.h @@ -16,10 +16,10 @@ #include "standard-headers/linux/qemu_fw_cfg.h" #include "qom/object.h" -#define VMCOREINFO_DEVICE "vmcoreinfo" +#define TYPE_VMCOREINFO "vmcoreinfo" typedef struct VMCoreInfoState VMCoreInfoState; DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, - VMCOREINFO_DEVICE) + TYPE_VMCOREINFO) typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo; @@ -33,7 +33,7 @@ struct VMCoreInfoState { /* returns NULL unless there is exactly one device */ static inline VMCoreInfoState *vmcoreinfo_find(void) { - Object *o = object_resolve_path_type("", VMCOREINFO_DEVICE, NULL); + Object *o = object_resolve_path_type("", TYPE_VMCOREINFO, NULL); return o ? VMCOREINFO(o) : NULL; } diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c index a9d718fc23..a68e3ad68c 100644 --- a/hw/misc/vmcoreinfo.c +++ b/hw/misc/vmcoreinfo.c @@ -47,13 +47,13 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp) */ if (!vmcoreinfo_find()) { error_setg(errp, "at most one %s device is permitted", - VMCOREINFO_DEVICE); + TYPE_VMCOREINFO); return; } if (!fw_cfg || !fw_cfg->dma_enabled) { error_setg(errp, "%s device requires fw_cfg with DMA", - VMCOREINFO_DEVICE); + TYPE_VMCOREINFO); return; } @@ -94,7 +94,7 @@ static void vmcoreinfo_device_class_init(ObjectClass *klass, void *data) } static const TypeInfo vmcoreinfo_device_info = { - .name = VMCOREINFO_DEVICE, + .name = TYPE_VMCOREINFO, .parent = TYPE_DEVICE, .instance_size = sizeof(VMCoreInfoState), .class_init = vmcoreinfo_device_class_init, From patchwork Wed Sep 2 22:42:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274776 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 3573EC433E7 for ; Wed, 2 Sep 2020 22:45:03 +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 EE4EC20767 for ; Wed, 2 Sep 2020 22:45:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="USNDIzCP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE4EC20767 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]:43242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbUz-0003Xh-Ri for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:45:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbU1-0001lp-Qd for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbU0-0008Jx-22 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086639; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Goj47Bu/6SLoRwjOZxfev0ioNtbqUlxNYirlYfcEFVE=; b=USNDIzCPHSbE3Vn+/rl7g6B/1O5Pv1jqN+hvkCliRTyxlgg1wo9m5JvkgF97NlFS116N/T PqeuoQEsxINAf8qatN9us1cP1uXDxnKmyLyFUov9z/EmRPbuh08h1oTN74GxVgJ71gxrf9 m1TdUQAxEblztEjKeSmbjbMnzvzM0qA= 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-37-VHRcOWL0MDy_8T0fX2Ph1g-1; Wed, 02 Sep 2020 18:43:57 -0400 X-MC-Unique: VHRcOWL0MDy_8T0fX2Ph1g-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 61D1C1DE02; Wed, 2 Sep 2020 22:43:56 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 042815D9CC; Wed, 2 Sep 2020 22:43:52 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 10/63] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID Date: Wed, 2 Sep 2020 18:42:18 -0400 Message-Id: <20200902224311.1321159-11-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Igor Mammedov , berrange@redhat.com, Ben Warren , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé --- Cc: Ben Warren Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: qemu-devel@nongnu.org --- include/hw/acpi/vmgenid.h | 6 +++--- hw/acpi/vmgenid.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index 86cd1da605..aff574df5f 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -6,7 +6,7 @@ #include "qemu/uuid.h" #include "qom/object.h" -#define VMGENID_DEVICE "vmgenid" +#define TYPE_VMGENID "vmgenid" #define VMGENID_GUID "guid" #define VMGENID_GUID_FW_CFG_FILE "etc/vmgenid_guid" #define VMGENID_ADDR_FW_CFG_FILE "etc/vmgenid_addr" @@ -18,7 +18,7 @@ typedef struct VmGenIdState VmGenIdState; DECLARE_INSTANCE_CHECKER(VmGenIdState, VMGENID, - VMGENID_DEVICE) + TYPE_VMGENID) struct VmGenIdState { DeviceClass parent_obj; @@ -29,7 +29,7 @@ struct VmGenIdState { /* returns NULL unless there is exactly one device */ static inline Object *find_vmgenid_dev(void) { - return object_resolve_path_type("", VMGENID_DEVICE, NULL); + return object_resolve_path_type("", TYPE_VMGENID, NULL); } void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 2df7623d74..53db6af75d 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -198,7 +198,7 @@ static void vmgenid_realize(DeviceState *dev, Error **errp) if (!bios_linker_loader_can_write_pointer()) { error_setg(errp, "%s requires DMA write support in fw_cfg, " - "which this machine type does not provide", VMGENID_DEVICE); + "which this machine type does not provide", TYPE_VMGENID); return; } @@ -206,7 +206,7 @@ static void vmgenid_realize(DeviceState *dev, Error **errp) * device. Check if there are several. */ if (!find_vmgenid_dev()) { - error_setg(errp, "at most one %s device is permitted", VMGENID_DEVICE); + error_setg(errp, "at most one %s device is permitted", TYPE_VMGENID); return; } @@ -232,7 +232,7 @@ static void vmgenid_device_class_init(ObjectClass *klass, void *data) } static const TypeInfo vmgenid_device_info = { - .name = VMGENID_DEVICE, + .name = TYPE_VMGENID, .parent = TYPE_DEVICE, .instance_size = sizeof(VmGenIdState), .class_init = vmgenid_device_class_init, From patchwork Wed Sep 2 22:42:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274771 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B1958C433E2 for ; Wed, 2 Sep 2020 22:49:50 +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 62F3120767 for ; Wed, 2 Sep 2020 22:49:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cSj2lGBM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62F3120767 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]:36834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbZd-0004CS-Ew for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:49:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbU8-00022I-0S for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:08 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24254 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbU6-0008Kf-AC for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086645; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X5fem+hpI97myR6L8jqxTgfrc8vXjZJY8/UZJdvvPyk=; b=cSj2lGBMXyYppvZkTx/Z3K5S/Gfx2d6kv/3O1masqrrB1iTWIkSgJnXw4CCMr2y9LW9cJf DC0bw9ijESSqlyAbh7Pz4L9TOiYEjA7+MJPnLdvTbRFOPEEludiAWq2SR/b2XUVEDJi5Ay MdXH323lPUqa5BMkU+v0yJf+r6mUP3k= 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-226-ygB5VtMqOmuqbT6PyZC_mw-1; Wed, 02 Sep 2020 18:44:03 -0400 X-MC-Unique: ygB5VtMqOmuqbT6PyZC_mw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8E9B18A2257; Wed, 2 Sep 2020 22:44:02 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 851225C1C4; Wed, 2 Sep 2020 22:44:02 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 13/63] etrax: Rename TYPE_ETRAX_FS_TIMER to TYPE_ETRAX_TIMER Date: Wed, 2 Sep 2020 18:42:21 -0400 Message-Id: <20200902224311.1321159-14-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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: "Edgar E. Iglesias" , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: "Edgar E. Iglesias" Cc: qemu-devel@nongnu.org --- hw/timer/etraxfs_timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 48f2e3ade2..585e934ed5 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -48,10 +48,10 @@ #define R_INTR 0x50 #define R_MASKED_INTR 0x54 -#define TYPE_ETRAX_FS_TIMER "etraxfs,timer" +#define TYPE_ETRAX_TIMER "etraxfs,timer" typedef struct ETRAXTimerState ETRAXTimerState; DECLARE_INSTANCE_CHECKER(ETRAXTimerState, ETRAX_TIMER, - TYPE_ETRAX_FS_TIMER) + TYPE_ETRAX_TIMER) struct ETRAXTimerState { SysBusDevice parent_obj; @@ -354,7 +354,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass, void *data) } static const TypeInfo etraxfs_timer_info = { - .name = TYPE_ETRAX_FS_TIMER, + .name = TYPE_ETRAX_TIMER, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ETRAXTimerState), .class_init = etraxfs_timer_class_init, From patchwork Wed Sep 2 22:42:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274774 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 84041C433E2 for ; Wed, 2 Sep 2020 22:47:06 +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 42D6620767 for ; Wed, 2 Sep 2020 22:47:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LN4+jCeM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42D6620767 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]:51682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbWz-0007Gn-89 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:47:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUB-0002CP-JH for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbU9-0008LQ-S9 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086649; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uTALatBGn4QE8HCwwyt8rDGqJUgIq8Z7wmi2LLpMhT0=; b=LN4+jCeMk4fesuBIZvU5CEekxj5FL+UhpMXZS2/togmaeBACJdc1UVIvirhK3IRnqxnrBM 9WSRTDfJVjbql7k68xfKF/aVKCsEgC99kOHXwtgRrGNCz6yQFa6WfWdsHfVlkCXFk0NbmQ DFK1fE3hAr+sdh1uy0k0TNmfDOSD7+Y= 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-335-XT1KqSkjNqq_bn-aIWMx6Q-1; Wed, 02 Sep 2020 18:44:07 -0400 X-MC-Unique: XT1KqSkjNqq_bn-aIWMx6Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBF7F801AAE for ; Wed, 2 Sep 2020 22:44:06 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id B61C65C1C4; Wed, 2 Sep 2020 22:44:03 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 14/63] i8254: Rename TYPE_I8254 to TYPE_PIT Date: Wed, 2 Sep 2020 18:42:22 -0400 Message-Id: <20200902224311.1321159-15-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , berrange@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- include/hw/timer/i8254.h | 4 ++-- hw/timer/i8254.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 1a522a2457..ddd925074f 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -45,7 +45,7 @@ typedef struct PITCommonClass PITCommonClass; DECLARE_OBJ_CHECKERS(PITCommonState, PITCommonClass, PIT_COMMON, TYPE_PIT_COMMON) -#define TYPE_I8254 "isa-pit" +#define TYPE_PIT "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, @@ -54,7 +54,7 @@ static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, DeviceState *dev; ISADevice *d; - d = isa_new(TYPE_I8254); + d = isa_new(TYPE_PIT); dev = DEVICE(d); qdev_prop_set_uint32(dev, "iobase", base); isa_realize_and_unref(d, bus, &error_fatal); diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index c01ee2c72a..86f455f67e 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -39,7 +39,7 @@ typedef struct PITClass PITClass; DECLARE_CLASS_CHECKERS(PITClass, PIT, - TYPE_I8254) + TYPE_PIT) struct PITClass { PITCommonClass parent_class; @@ -370,7 +370,7 @@ static void pit_class_initfn(ObjectClass *klass, void *data) } static const TypeInfo pit_info = { - .name = TYPE_I8254, + .name = TYPE_PIT, .parent = TYPE_PIT_COMMON, .instance_size = sizeof(PITCommonState), .class_init = pit_class_initfn, From patchwork Wed Sep 2 22:42:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274772 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 DB9F2C433E7 for ; Wed, 2 Sep 2020 22:48:57 +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 A651420767 for ; Wed, 2 Sep 2020 22:48:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RL1h9WMN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A651420767 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]:59990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbYm-0002An-P6 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:48:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUC-0002F1-JW for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:12 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:37079 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUA-0008LW-RJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086650; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QwtDvCHQzjINymb31Ge9PCZIU0/FWVcz5SJd4ITY3yk=; b=RL1h9WMNgVUn5qFO+G21wn6tcG5Wd2gKo3ukkIi1z58p97FH8VhkZjBQKgq+1+faUrdIWu afg1zCmwct9ZLg//fGPcyDziFSeTEcwONG7e0tfQQWgny9Vz6iCGDioQAgj63xTWOK6l0y SLV9eNhWIKcuseuI+g+q38rYmnsLdrw= 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-385-um_Uo9j-MziSkLKhsX_KCQ-1; Wed, 02 Sep 2020 18:44:08 -0400 X-MC-Unique: um_Uo9j-MziSkLKhsX_KCQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E680801AB3 for ; Wed, 2 Sep 2020 22:44:07 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DAAE5C1C4; Wed, 2 Sep 2020 22:44:07 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 15/63] i8259: Rename TYPE_I8259 to TYPE_PIC Date: Wed, 2 Sep 2020 18:42:23 -0400 Message-Id: <20200902224311.1321159-16-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , berrange@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- hw/intc/i8259.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 344fd04db1..e536cc90be 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -37,10 +37,10 @@ //#define DEBUG_IRQ_LATENCY -#define TYPE_I8259 "isa-i8259" +#define TYPE_PIC "isa-i8259" typedef struct PICClass PICClass; DECLARE_CLASS_CHECKERS(PICClass, PIC, - TYPE_I8259) + TYPE_PIC) /** * PICClass: @@ -418,7 +418,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) irq_set = g_new0(qemu_irq, ISA_NUM_IRQS); - isadev = i8259_init_chip(TYPE_I8259, bus, true); + isadev = i8259_init_chip(TYPE_PIC, bus, true); dev = DEVICE(isadev); qdev_connect_gpio_out(dev, 0, parent_irq); @@ -428,7 +428,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) isa_pic = dev; - isadev = i8259_init_chip(TYPE_I8259, bus, false); + isadev = i8259_init_chip(TYPE_PIC, bus, false); dev = DEVICE(isadev); qdev_connect_gpio_out(dev, 0, irq_set[2]); @@ -451,7 +451,7 @@ static void i8259_class_init(ObjectClass *klass, void *data) } static const TypeInfo i8259_info = { - .name = TYPE_I8259, + .name = TYPE_PIC, .instance_size = sizeof(PICCommonState), .parent = TYPE_PIC_COMMON, .class_init = i8259_class_init, From patchwork Wed Sep 2 22:42:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274769 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 30A81C433E2 for ; Wed, 2 Sep 2020 22:51:18 +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 DF06820767 for ; Wed, 2 Sep 2020 22:51:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B7FiWTm2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF06820767 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]:45174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbb2-0007bJ-VL for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUI-0002U4-NU for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUG-0008Mo-T7 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086656; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lt1IC/XNJ8g37UsGuausIOFYYvEoABFnZL05pfNJNRM=; b=B7FiWTm29ZADf9XTdG0BmLjnXAs3LJh93aSlA2e8+deLoovCOpxRBjMi7HVyxFQJjMqdyF mydPCrADUHdMjv5eeECGKAWbKuAXe9D5F6g2llxzeB0ZQJCbkTznvFaBOjPpDn53Koc+h7 yBuJSEyc0vNmoe2Z1mvwM5Sd/vyA8fA= 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-207-MBodZYnOOcuThSSoRotfMw-1; Wed, 02 Sep 2020 18:44:14 -0400 X-MC-Unique: MBodZYnOOcuThSSoRotfMw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 304A818A2251 for ; Wed, 2 Sep 2020 22:44:13 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7703460C0F; Wed, 2 Sep 2020 22:44:09 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 17/63] intel-hda: Rename TYPE_INTEL_HDA_GENERIC to TYPE_INTEL_HDA Date: Wed, 2 Sep 2020 18:42:25 -0400 Message-Id: <20200902224311.1321159-18-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: berrange@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- hw/audio/intel-hda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 4330213fff..28c4edeece 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -202,10 +202,10 @@ struct IntelHDAState { bool old_msi_addr; }; -#define TYPE_INTEL_HDA_GENERIC "intel-hda-generic" +#define TYPE_INTEL_HDA "intel-hda-generic" DECLARE_INSTANCE_CHECKER(IntelHDAState, INTEL_HDA, - TYPE_INTEL_HDA_GENERIC) + TYPE_INTEL_HDA) struct IntelHDAReg { const char *name; /* register name */ @@ -1257,7 +1257,7 @@ static void intel_hda_class_init_ich9(ObjectClass *klass, void *data) } static const TypeInfo intel_hda_info = { - .name = TYPE_INTEL_HDA_GENERIC, + .name = TYPE_INTEL_HDA, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(IntelHDAState), .class_init = intel_hda_class_init, @@ -1270,13 +1270,13 @@ static const TypeInfo intel_hda_info = { static const TypeInfo intel_hda_info_ich6 = { .name = "intel-hda", - .parent = TYPE_INTEL_HDA_GENERIC, + .parent = TYPE_INTEL_HDA, .class_init = intel_hda_class_init_ich6, }; static const TypeInfo intel_hda_info_ich9 = { .name = "ich9-intel-hda", - .parent = TYPE_INTEL_HDA_GENERIC, + .parent = TYPE_INTEL_HDA, .class_init = intel_hda_class_init_ich9, }; From patchwork Wed Sep 2 22:42:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274767 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D3B81C433E7 for ; Wed, 2 Sep 2020 22:52:34 +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 8F2F220767 for ; Wed, 2 Sep 2020 22:52:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AxUK8fjH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F2F220767 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]:53602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbcH-0002WL-M7 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUN-0002fb-4l for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUK-0008Ns-Qj for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086660; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wYLNfiuwezjP8Gx8u8/rjD1Ud7iEW35L21/hzv5JHX0=; b=AxUK8fjHIbay7DH+g9pNXU5AfSYMetj+cxOgXmaGDozE746OECr5Jv1eWySHX4eelRuJTd v8wUBKeZiluTJQWpVDHYt9+qs6xw8idWUkQiW/kIakD9jXu6EvpzfPPObrOAk/cKEsia9U ZfDwSkf6wDc3k0ICX48J1wWdqOcGQx8= 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-172-OhhYnk6DPwax_6Vy4I-oQg-1; Wed, 02 Sep 2020 18:44:16 -0400 X-MC-Unique: OhhYnk6DPwax_6Vy4I-oQg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 910658064BF; Wed, 2 Sep 2020 22:44:15 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 522A660C0F; Wed, 2 Sep 2020 22:44:15 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 19/63] mptsas: Rename TYPE_MPTSAS1068 to TYPE_MPT_SAS Date: Wed, 2 Sep 2020 18:42:27 -0400 Message-Id: <20200902224311.1321159-20-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Fam Zheng , Paolo Bonzini , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: Fam Zheng Cc: qemu-devel@nongnu.org --- hw/scsi/mptsas.h | 4 ++-- hw/scsi/mptsas.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h index b85ac1a5fc..c618f686a3 100644 --- a/hw/scsi/mptsas.h +++ b/hw/scsi/mptsas.h @@ -14,10 +14,10 @@ typedef struct MPTSASRequest MPTSASRequest; -#define TYPE_MPTSAS1068 "mptsas1068" +#define TYPE_MPT_SAS "mptsas1068" typedef struct MPTSASState MPTSASState; DECLARE_INSTANCE_CHECKER(MPTSASState, MPT_SAS, - TYPE_MPTSAS1068) + TYPE_MPT_SAS) enum { DOORBELL_NONE, diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 135e7d96e4..0dbb70c17b 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1434,7 +1434,7 @@ static void mptsas1068_class_init(ObjectClass *oc, void *data) } static const TypeInfo mptsas_info = { - .name = TYPE_MPTSAS1068, + .name = TYPE_MPT_SAS, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(MPTSASState), .class_init = mptsas1068_class_init, From patchwork Wed Sep 2 22:42:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274770 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7A14AC433E7 for ; Wed, 2 Sep 2020 22:50:26 +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 4294420767 for ; Wed, 2 Sep 2020 22:50:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bthsiG4b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4294420767 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]:40180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbaD-0005Wg-Dp for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:50:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUL-0002bm-Nk for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35919 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUJ-0008Nh-V4 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086659; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BNJDGt35Be5Lz+v21KbX3MZBUbrFcuiwR5yT7mRhg7g=; b=bthsiG4bBN++qYCvmkR6/1yqaeb9EhOhjknMvWT5VCznInqxU4J52hjHsOxsc3tw6NmE3m TsVl9H/uOr4mUI92QuMFMXk0FJze7ohKmN8aCec+Cy0Q/+oQ+t5/RQkfvCxCKmZc7Jop5X AE73yqItBwmn8HgsJ+Hdd3KVRZ4LPDc= 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-308-45yAljuCOMyx8-3kx4SSaw-1; Wed, 02 Sep 2020 18:44:17 -0400 X-MC-Unique: 45yAljuCOMyx8-3kx4SSaw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A58C91DE00; Wed, 2 Sep 2020 22:44:16 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43D2C5C1C4; Wed, 2 Sep 2020 22:44:16 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 20/63] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312 Date: Wed, 2 Sep 2020 18:42:28 -0400 Message-Id: <20200902224311.1321159-21-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:20:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: qemu-ppc@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost Reviewed-by: Hervé Poussineau --- Cc: "Hervé Poussineau" Cc: qemu-ppc@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/isa/pc87312.h | 4 ++-- hw/isa/pc87312.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index a65168a157..da8dc5ddf5 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -29,10 +29,10 @@ #include "qom/object.h" -#define TYPE_PC87312_SUPERIO "pc87312" +#define TYPE_PC87312 "pc87312" typedef struct PC87312State PC87312State; DECLARE_INSTANCE_CHECKER(PC87312State, PC87312, - TYPE_PC87312_SUPERIO) + TYPE_PC87312) struct PC87312State { /*< private >*/ diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 0cacbbc91b..8d7b8d3db2 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -371,7 +371,7 @@ static void pc87312_class_init(ObjectClass *klass, void *data) } static const TypeInfo pc87312_type_info = { - .name = TYPE_PC87312_SUPERIO, + .name = TYPE_PC87312, .parent = TYPE_ISA_SUPERIO, .instance_size = sizeof(PC87312State), .instance_init = pc87312_initfn, From patchwork Wed Sep 2 22:42:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274768 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 C475FC433E2 for ; Wed, 2 Sep 2020 22:51:50 +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 8C13920767 for ; Wed, 2 Sep 2020 22:51:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fmufvpH9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C13920767 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]:48678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbbZ-0000a6-La for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUP-0002lh-Q1 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUO-0008OP-27 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086663; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nbDsGxI0emGG/j7nIsqF0JY6xFaieK9fcpfWIroPNf4=; b=fmufvpH9JGdZDgrTrmLS8XVDl+1CIzKjVosC0K7z2pF7miFexDDfDfx07U8zebS4JyiPu+ 015Bc+L+mA1SRekCqWTfZzwTS8Bp6ViWfe9s041lxbrrejsg7OXPb5ktfg+4CspYznEU3l UzhuZGBcXnCnjc3VPEiteQ1dbnbGcfo= 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-454-UbyF-T1QO56pANVHRlGXOA-1; Wed, 02 Sep 2020 18:44:21 -0400 X-MC-Unique: UbyF-T1QO56pANVHRlGXOA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69673801AAE; Wed, 2 Sep 2020 22:44:20 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5282B7EEA7; Wed, 2 Sep 2020 22:44:17 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 21/63] pxb: Rename TYPE_PXB_DEVICE to TYPE_PXB_DEV Date: Wed, 2 Sep 2020 18:42:29 -0400 Message-Id: <20200902224311.1321159-22-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: berrange@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: qemu-devel@nongnu.org --- hw/pci-bridge/pci_expander_bridge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index aedded1064..42e58d5850 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -41,10 +41,10 @@ struct PXBBus { char bus_path[8]; }; -#define TYPE_PXB_DEVICE "pxb" +#define TYPE_PXB_DEV "pxb" typedef struct PXBDev PXBDev; DECLARE_INSTANCE_CHECKER(PXBDev, PXB_DEV, - TYPE_PXB_DEVICE) + TYPE_PXB_DEV) #define TYPE_PXB_PCIE_DEVICE "pxb-pcie" DECLARE_INSTANCE_CHECKER(PXBDev, PXB_PCIE_DEV, @@ -322,7 +322,7 @@ static void pxb_dev_class_init(ObjectClass *klass, void *data) } static const TypeInfo pxb_dev_info = { - .name = TYPE_PXB_DEVICE, + .name = TYPE_PXB_DEV, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PXBDev), .class_init = pxb_dev_class_init, From patchwork Wed Sep 2 22:42:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274766 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=-7.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED 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 8EF17C433E2 for ; Wed, 2 Sep 2020 22:53:19 +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 5537320767 for ; Wed, 2 Sep 2020 22:53:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hfiltdsd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5537320767 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]:57124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbd0-0003vK-DX for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUc-0003Iu-39 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:38 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56814 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUZ-0008PB-5J for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086674; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RgzaG8X4ZM/mnLdMi8n7iK/N9E49amWId0S3jwUctVg=; b=Hfiltdsd+d4U8v7RANPbpG49x837c/QIDNHiiDFU28Q68YP1Y9YpnsN+IDSCvmaXr3agVa Lmt20hsr5aZA1aaZ0i9xO2xmcm9lvOmGRVsKPcepTd8POIivQtR/ITgULQa8wnHfmFTVWB X+0CP4pcKJCbAn2QQrYrTLtnhQHq/II= 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-296-fn-tSKjWNzOxa5UWVRkIcA-1; Wed, 02 Sep 2020 18:44:32 -0400 X-MC-Unique: fn-tSKjWNzOxa5UWVRkIcA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B550E18A2256; Wed, 2 Sep 2020 22:44:31 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E10219C59; Wed, 2 Sep 2020 22:44:31 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 24/63] scsi: Rename TYPE_AM53C974_DEVICE to TYPE_PCI_ESP Date: Wed, 2 Sep 2020 18:42:32 -0400 Message-Id: <20200902224311.1321159-25-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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: Fam Zheng , Paolo Bonzini , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: Fam Zheng Cc: qemu-devel@nongnu.org --- hw/scsi/esp-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 2ce96dc56e..2b1198380b 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -35,11 +35,11 @@ #include "qemu/module.h" #include "qom/object.h" -#define TYPE_AM53C974_DEVICE "am53c974" +#define TYPE_PCI_ESP "am53c974" typedef struct PCIESPState PCIESPState; DECLARE_INSTANCE_CHECKER(PCIESPState, PCI_ESP, - TYPE_AM53C974_DEVICE) + TYPE_PCI_ESP) #define DMA_CMD 0x0 #define DMA_STC 0x1 @@ -400,7 +400,7 @@ static void esp_pci_class_init(ObjectClass *klass, void *data) } static const TypeInfo esp_pci_info = { - .name = TYPE_AM53C974_DEVICE, + .name = TYPE_PCI_ESP, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIESPState), .class_init = esp_pci_class_init, @@ -525,7 +525,7 @@ static void dc390_class_init(ObjectClass *klass, void *data) static const TypeInfo dc390_info = { .name = TYPE_DC390_DEVICE, - .parent = TYPE_AM53C974_DEVICE, + .parent = TYPE_PCI_ESP, .instance_size = sizeof(DC390State), .class_init = dc390_class_init, }; From patchwork Wed Sep 2 22:42:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274765 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9F119C433E2 for ; Wed, 2 Sep 2020 22:54:24 +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 5378720767 for ; Wed, 2 Sep 2020 22:54:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QH/C6wWq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5378720767 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]:34904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbe3-0006RJ-D7 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:54:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUc-0003Kx-SD for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUa-0008PQ-9J for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086675; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bMfjvbM2z2xQGmcUFEZywatKTQzj+cUxdym79sfHgMY=; b=QH/C6wWqa4yNwTM6SzAUlopA1/8iN/doO/ulup45G61m09NELDlq92XouwsR5JbceoPox8 hRCASiV9BqQiVxpTLB9nfefUntJDkdOjGTICSPdjSERCqGAIc8eRBD7gaoyQgtyTVlaBiN lQTsOFfgzkdLtW63IcCbIIH+mAsZHoU= 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-524-6v8NTz8jNiGpVM9g5byREA-1; Wed, 02 Sep 2020 18:44:33 -0400 X-MC-Unique: 6v8NTz8jNiGpVM9g5byREA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B31D4801AAE; Wed, 2 Sep 2020 22:44:32 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BEDD19C59; Wed, 2 Sep 2020 22:44:32 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 25/63] scsi: Rename TYPE_DC390_DEVICE to TYPE_DC390 Date: Wed, 2 Sep 2020 18:42:33 -0400 Message-Id: <20200902224311.1321159-26-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Fam Zheng , Paolo Bonzini , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: Fam Zheng Cc: qemu-devel@nongnu.org --- hw/scsi/esp-pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 2b1198380b..58398609be 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -416,9 +416,9 @@ struct DC390State { }; typedef struct DC390State DC390State; -#define TYPE_DC390_DEVICE "dc390" +#define TYPE_DC390 "dc390" DECLARE_INSTANCE_CHECKER(DC390State, DC390, - TYPE_DC390_DEVICE) + TYPE_DC390) #define EE_ADAPT_SCSI_ID 64 #define EE_MODE2 65 @@ -524,7 +524,7 @@ static void dc390_class_init(ObjectClass *klass, void *data) } static const TypeInfo dc390_info = { - .name = TYPE_DC390_DEVICE, + .name = TYPE_DC390, .parent = TYPE_PCI_ESP, .instance_size = sizeof(DC390State), .class_init = dc390_class_init, From patchwork Wed Sep 2 22:42:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274763 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 35AFDC433E2 for ; Wed, 2 Sep 2020 22:55:49 +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 E377420767 for ; Wed, 2 Sep 2020 22:55:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KJ9LpmAa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E377420767 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]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbfP-0001Zr-Sm for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:55:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUd-0003Lu-8E for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:39 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42486 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUb-0008Pj-8r for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086676; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MRcfGB0acI9G303nkv7uPp/ZBKOG4rjAKmd7ecTUl1A=; b=KJ9LpmAa6Xy0YporekSvhZyUWLikDPeEYINwDEgNBx2AWp4ej/tbni9FGH63EimF5L40yf UfKueDNUddKACVHJe4OKGhu3ddwSJFdGoBC6CcyCxMlUbbdRCWp+Xey5rvqrUCPVohZCRw zeUBVIyzyO9j6ZrYyHYbjU/EeF8yFgE= 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-434-EmQJ64MuPe-U14nKJyy_oA-1; Wed, 02 Sep 2020 18:44:35 -0400 X-MC-Unique: EmQJ64MuPe-U14nKJyy_oA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6731801AB1; Wed, 2 Sep 2020 22:44:33 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CE8619C59; Wed, 2 Sep 2020 22:44:33 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 26/63] sun4m: Rename TYPE_SUN4M_MEMORY to TYPE_SUN4M_RAM Date: Wed, 2 Sep 2020 18:42:34 -0400 Message-Id: <20200902224311.1321159-27-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:20:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Mark Cave-Ayland , berrange@redhat.com, Artyom Tarasenko Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Cc: qemu-devel@nongnu.org --- hw/sparc/sun4m.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 5ed922d436..3410d8db6c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -779,10 +779,10 @@ static const TypeInfo prom_info = { .class_init = prom_class_init, }; -#define TYPE_SUN4M_MEMORY "memory" +#define TYPE_SUN4M_RAM "memory" typedef struct RamDevice RamDevice; DECLARE_INSTANCE_CHECKER(RamDevice, SUN4M_RAM, - TYPE_SUN4M_MEMORY) + TYPE_SUN4M_RAM) struct RamDevice { SysBusDevice parent_obj; @@ -817,7 +817,7 @@ static void ram_class_init(ObjectClass *klass, void *data) } static const TypeInfo ram_info = { - .name = TYPE_SUN4M_MEMORY, + .name = TYPE_SUN4M_RAM, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(RamDevice), .instance_init = ram_initfn, From patchwork Wed Sep 2 22:42:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274764 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 01F68C433E7 for ; Wed, 2 Sep 2020 22:54:47 +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 BDEDD20767 for ; Wed, 2 Sep 2020 22:54:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZP3GkgS2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDEDD20767 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]:37322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbeP-0007Q4-Uw for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:54:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUe-0003Pj-Jr for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:40 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32915 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUc-0008Q7-Tr for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086678; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JU9/znqWg2TUYNPH2icBhlpG7DUAJjHZQMnhpf3zXFo=; b=ZP3GkgS2ln/1AW+nVdBpgnbwCctzmt3+jqHdKkR/I1gzEaHliyBJ7/9HDPBBvFONRmHjg5 8Mf2Xwx8OI8JdsQMz5RuiOw+i3wskhbol82k9LedU/5BjPeAvkwJSvRRS9QJ7Gn4qpM+dc sm/s9k2M1XO9uinLCyXP3dKXWvJcHlc= 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-365-VYNSAfAzPayqH8SBh91ByQ-1; Wed, 02 Sep 2020 18:44:36 -0400 X-MC-Unique: VYNSAfAzPayqH8SBh91ByQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28BF48030C7; Wed, 2 Sep 2020 22:44:35 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id E17DA19C59; Wed, 2 Sep 2020 22:44:34 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 27/63] sun4u: Rename TYPE_SUN4U_MEMORY to TYPE_SUN4U_RAM Date: Wed, 2 Sep 2020 18:42:35 -0400 Message-Id: <20200902224311.1321159-28-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Mark Cave-Ayland , berrange@redhat.com, Artyom Tarasenko Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Cc: qemu-devel@nongnu.org --- hw/sparc64/sun4u.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 67985414e2..fe0d84bf6c 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -493,10 +493,10 @@ static const TypeInfo prom_info = { }; -#define TYPE_SUN4U_MEMORY "memory" +#define TYPE_SUN4U_RAM "memory" typedef struct RamDevice RamDevice; DECLARE_INSTANCE_CHECKER(RamDevice, SUN4U_RAM, - TYPE_SUN4U_MEMORY) + TYPE_SUN4U_RAM) struct RamDevice { SysBusDevice parent_obj; @@ -524,7 +524,7 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size) RamDevice *d; /* allocate RAM */ - dev = qdev_new(TYPE_SUN4U_MEMORY); + dev = qdev_new(TYPE_SUN4U_RAM); s = SYS_BUS_DEVICE(dev); d = SUN4U_RAM(dev); @@ -548,7 +548,7 @@ static void ram_class_init(ObjectClass *klass, void *data) } static const TypeInfo ram_info = { - .name = TYPE_SUN4U_MEMORY, + .name = TYPE_SUN4U_RAM, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(RamDevice), .class_init = ram_class_init, From patchwork Wed Sep 2 22:42:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274761 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D48C9C433E2 for ; Wed, 2 Sep 2020 22:57:22 +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 8D6E020767 for ; Wed, 2 Sep 2020 22:57:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="K8rvH6ro" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D6E020767 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]:51696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbgv-0004vN-Ax for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:57:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUj-0003Yg-Jo for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:45 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21343 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUh-0008Rn-Ta for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086682; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VveOuf1NqcZqKq/VckNh6Ry5KVWolwLEYxHftHR/p48=; b=K8rvH6rojohOaZkDzXPbIJAu43yTBdNUGuUdzoK7CEpn+IkKeLK02n7wdZvcu7SMblmQ79 xFzFojdPszrGq9veOkzRrth7VV8jJPQ81Gadm/2D+EMKOX1z24xJtrq63lJ15YljtPkxOU mI9cwDvrHIoAYcaTlPzT0nsS5ucw0eI= 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-30-mT8hOFRsNoOWDa1VAE63jQ-1; Wed, 02 Sep 2020 18:44:40 -0400 X-MC-Unique: mT8hOFRsNoOWDa1VAE63jQ-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 E54238064BF; Wed, 2 Sep 2020 22:44:39 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC5F95D9CC; Wed, 2 Sep 2020 22:44:39 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 29/63] versatile: Rename TYPE_VERSATILE_PCI_HOST to TYPE_PCI_VPB_HOST Date: Wed, 2 Sep 2020 18:42:37 -0400 Message-Id: <20200902224311.1321159-30-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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: Peter Maydell , qemu-arm@nongnu.org, berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- hw/pci-host/versatile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 3553277f94..7b6a754b8b 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -161,9 +161,9 @@ static const VMStateDescription pci_vpb_vmstate = { DECLARE_INSTANCE_CHECKER(PCIVPBState, PCI_VPB, TYPE_VERSATILE_PCI) -#define TYPE_VERSATILE_PCI_HOST "versatile_pci_host" +#define TYPE_PCI_VPB_HOST "versatile_pci_host" DECLARE_INSTANCE_CHECKER(PCIDevice, PCI_VPB_HOST, - TYPE_VERSATILE_PCI_HOST) + TYPE_PCI_VPB_HOST) typedef enum { PCI_IMAP0 = 0x0, @@ -410,7 +410,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) PCI_DEVFN(11, 0), TYPE_PCI_BUS); h->bus = &s->pci_bus; - object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_VERSATILE_PCI_HOST); + object_initialize(&s->pci_dev, sizeof(s->pci_dev), TYPE_PCI_VPB_HOST); for (i = 0; i < 4; i++) { sysbus_init_irq(sbd, &s->irq[i]); @@ -487,7 +487,7 @@ static void versatile_pci_host_class_init(ObjectClass *klass, void *data) } static const TypeInfo versatile_pci_host_info = { - .name = TYPE_VERSATILE_PCI_HOST, + .name = TYPE_PCI_VPB_HOST, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), .class_init = versatile_pci_host_class_init, From patchwork Wed Sep 2 22:42:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274759 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 440ADC433E7 for ; Wed, 2 Sep 2020 22:58:57 +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 0A96820767 for ; Wed, 2 Sep 2020 22:58:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LiR3StZg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A96820767 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]:32938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbiS-0000Ga-7z for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:58:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUq-0003hL-FE for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21478 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUo-0008Sd-De for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086689; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U6ofSfJYUOIijxDXEI+ln7bb/vVelslorwkvaNNaAT8=; b=LiR3StZgmoHQzRPVjmQ7VNP9KgvAezBdvXPKpmYc/Yh7c965cnrsITEZFOj2x6UGXjriNp 9iURdhK3jnd7IQtiqQJ+5V6uotVZ4njz02M6GT0JR5Xq/IXTj53bi8upl4w4D+6gYBPMvv cZEqAJEcsciZx/3Sx5D7UuvaT1piiNI= 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-379-w1iS8sOaO5CJBWjCPVQJ1w-1; Wed, 02 Sep 2020 18:44:48 -0400 X-MC-Unique: w1iS8sOaO5CJBWjCPVQJ1w-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 169718030C7; Wed, 2 Sep 2020 22:44:47 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DB215D9CC; Wed, 2 Sep 2020 22:44:41 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 31/63] virtio-console: Rename TYPE_VIRTIO_CONSOLE_SERIAL_PORT to TYPE_VIRTIO_CONSOLE Date: Wed, 2 Sep 2020 18:42:39 -0400 Message-Id: <20200902224311.1321159-32-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:25:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Laurent Vivier , berrange@redhat.com, "Michael S. Tsirkin" , Amit Shah , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Laurent Vivier Cc: Amit Shah Cc: "Michael S. Tsirkin" Cc: "Marc-André Lureau" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- hw/char/virtio-console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index bc752cf90f..cf4c0a0a95 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -21,10 +21,10 @@ #include "qapi/qapi-events-char.h" #include "qom/object.h" -#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" +#define TYPE_VIRTIO_CONSOLE "virtserialport" typedef struct VirtConsole VirtConsole; DECLARE_INSTANCE_CHECKER(VirtConsole, VIRTIO_CONSOLE, - TYPE_VIRTIO_CONSOLE_SERIAL_PORT) + TYPE_VIRTIO_CONSOLE) struct VirtConsole { VirtIOSerialPort parent_obj; @@ -269,7 +269,7 @@ static void virtconsole_class_init(ObjectClass *klass, void *data) static const TypeInfo virtconsole_info = { .name = "virtconsole", - .parent = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, + .parent = TYPE_VIRTIO_CONSOLE, .class_init = virtconsole_class_init, }; @@ -293,7 +293,7 @@ static void virtserialport_class_init(ObjectClass *klass, void *data) } static const TypeInfo virtserialport_info = { - .name = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, + .name = TYPE_VIRTIO_CONSOLE, .parent = TYPE_VIRTIO_SERIAL_PORT, .instance_size = sizeof(VirtConsole), .class_init = virtserialport_class_init, From patchwork Wed Sep 2 22:42:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274760 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B6640C433E7 for ; Wed, 2 Sep 2020 22:58:04 +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 6B42B20767 for ; Wed, 2 Sep 2020 22:58:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DJNkG3xa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B42B20767 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]:56216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbhb-0006jR-Hm for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:58:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUu-0003r0-Ie for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:56 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUs-0008TM-RN for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086694; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nFt+MWb7tMkjfmMJ8Ae9oYce7rQDt8KQpC8LG1oB9d8=; b=DJNkG3xaSK405DAkthBC8QjO2hBEPxa/i3JWLFyrvcmG3HD/HG2Y6TK0Gn7+s5Q6aZs3z1 8VM5dlftVv8RyooIO386ZzcY1FW3x46RtJAxB3/7qjie0OO8tUfDuD5Y3XnVc1jx7EP+ad Q7zJ0tcxGtx3QyZP1MMEXcQU+F+DIPU= 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-12-TuyVu6xpMuC5gHdC9a9L6g-1; Wed, 02 Sep 2020 18:44:49 -0400 X-MC-Unique: TuyVu6xpMuC5gHdC9a9L6g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C53818A2251; Wed, 2 Sep 2020 22:44:48 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4F361C4; Wed, 2 Sep 2020 22:44:47 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 32/63] ahci: Rename ICH_AHCI to ICH9_AHCI Date: Wed, 2 Sep 2020 18:42:40 -0400 Message-Id: <20200902224311.1321159-33-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: John Snow , berrange@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé --- Cc: John Snow Cc: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/ide/ahci.h | 2 +- hw/ide/ahci.c | 4 ++-- hw/ide/ich.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index 4cf6813d80..da3cddcc65 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -54,7 +54,7 @@ typedef struct AHCIState { typedef struct AHCIPCIState AHCIPCIState; #define TYPE_ICH9_AHCI "ich9-ahci" -DECLARE_INSTANCE_CHECKER(AHCIPCIState, ICH_AHCI, +DECLARE_INSTANCE_CHECKER(AHCIPCIState, ICH9_AHCI, TYPE_ICH9_AHCI) int32_t ahci_get_num_ports(PCIDevice *dev); diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index b696c6291a..ee1d47ff75 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1819,7 +1819,7 @@ type_init(sysbus_ahci_register_types) int32_t ahci_get_num_ports(PCIDevice *dev) { - AHCIPCIState *d = ICH_AHCI(dev); + AHCIPCIState *d = ICH9_AHCI(dev); AHCIState *ahci = &d->ahci; return ahci->ports; @@ -1827,7 +1827,7 @@ int32_t ahci_get_num_ports(PCIDevice *dev) void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd) { - AHCIPCIState *d = ICH_AHCI(dev); + AHCIPCIState *d = ICH9_AHCI(dev); AHCIState *ahci = &d->ahci; int i; diff --git a/hw/ide/ich.c b/hw/ide/ich.c index eff3188fff..51cd2f38b7 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -91,14 +91,14 @@ static const VMStateDescription vmstate_ich9_ahci = { static void pci_ich9_reset(DeviceState *dev) { - AHCIPCIState *d = ICH_AHCI(dev); + AHCIPCIState *d = ICH9_AHCI(dev); ahci_reset(&d->ahci); } static void pci_ich9_ahci_init(Object *obj) { - struct AHCIPCIState *d = ICH_AHCI(obj); + struct AHCIPCIState *d = ICH9_AHCI(obj); ahci_init(&d->ahci, DEVICE(obj)); } @@ -108,7 +108,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error **errp) struct AHCIPCIState *d; int sata_cap_offset; uint8_t *sata_cap; - d = ICH_AHCI(dev); + d = ICH9_AHCI(dev); int ret; ahci_realize(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6); @@ -154,7 +154,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error **errp) static void pci_ich9_uninit(PCIDevice *dev) { struct AHCIPCIState *d; - d = ICH_AHCI(dev); + d = ICH9_AHCI(dev); msi_uninit(dev); ahci_uninit(&d->ahci); From patchwork Wed Sep 2 22:42:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274762 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B9E54C433E2 for ; Wed, 2 Sep 2020 22:56:31 +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 6F61820767 for ; Wed, 2 Sep 2020 22:56:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YHNPYsAO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F61820767 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]:47826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbg6-0003MO-FK for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:56:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUt-0003ow-RA for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:55 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:46070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUr-0008T1-0T for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086692; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q5lEhIAR4lhJcBlj3624y58w+ajDgHA2fODHeMYfo/o=; b=YHNPYsAOWelxQIVa7vIf29zrms/OH/Kng1nBnmzOVVUDR8Qj7Wr6sKHPiUpoAUaAt4CFdM HxwtLCYgCqIb3KuPE33FGNhF07UzbWaBg2MsUVQWuYk7l6z+HySG9RwwB5IFIrqu/fhTMG 2kQJu+rj1LkZUj/wTQ2VA3sDPTCopgo= 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-13-_pGig2m5NJCfbCfxH1xX8A-1; Wed, 02 Sep 2020 18:44:50 -0400 X-MC-Unique: _pGig2m5NJCfbCfxH1xX8A-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 0685E1DE02 for ; Wed, 2 Sep 2020 22:44:50 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAC2D5D9CC; Wed, 2 Sep 2020 22:44:49 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 34/63] can: Rename KVASER_PCI_DEV to KVASER_PCI Date: Wed, 2 Sep 2020 18:42:42 -0400 Message-Id: <20200902224311.1321159-35-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Jason Wang , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Jason Wang Cc: qemu-devel@nongnu.org --- hw/net/can/can_kvaser_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 12d4f8df33..2143ed83f3 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -48,7 +48,7 @@ #define TYPE_KVASER_PCI "kvaser_pci" typedef struct KvaserPCIState KvaserPCIState; -DECLARE_INSTANCE_CHECKER(KvaserPCIState, KVASER_PCI_DEV, +DECLARE_INSTANCE_CHECKER(KvaserPCIState, KVASER_PCI, TYPE_KVASER_PCI) #ifndef KVASER_PCI_VENDOR_ID1 @@ -109,7 +109,7 @@ static void kvaser_pci_irq_handler(void *opaque, int irq_num, int level) static void kvaser_pci_reset(DeviceState *dev) { - KvaserPCIState *d = KVASER_PCI_DEV(dev); + KvaserPCIState *d = KVASER_PCI(dev); CanSJA1000State *s = &d->sja_state; can_sja_hardware_reset(s); @@ -221,7 +221,7 @@ static const MemoryRegionOps kvaser_pci_xilinx_io_ops = { static void kvaser_pci_realize(PCIDevice *pci_dev, Error **errp) { - KvaserPCIState *d = KVASER_PCI_DEV(pci_dev); + KvaserPCIState *d = KVASER_PCI(pci_dev); CanSJA1000State *s = &d->sja_state; uint8_t *pci_conf; @@ -254,7 +254,7 @@ static void kvaser_pci_realize(PCIDevice *pci_dev, Error **errp) static void kvaser_pci_exit(PCIDevice *pci_dev) { - KvaserPCIState *d = KVASER_PCI_DEV(pci_dev); + KvaserPCIState *d = KVASER_PCI(pci_dev); CanSJA1000State *s = &d->sja_state; can_sja_disconnect(s); @@ -279,7 +279,7 @@ static const VMStateDescription vmstate_kvaser_pci = { static void kvaser_pci_instance_init(Object *obj) { - KvaserPCIState *d = KVASER_PCI_DEV(obj); + KvaserPCIState *d = KVASER_PCI(obj); object_property_add_link(obj, "canbus", TYPE_CAN_BUS, (Object **)&d->canbus, From patchwork Wed Sep 2 22:42:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274758 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 810C7C433E7 for ; Wed, 2 Sep 2020 22:59:53 +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 46F5D20767 for ; Wed, 2 Sep 2020 22:59:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P2UUK5HN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46F5D20767 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]:36410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbjM-0001eW-D2 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 18:59:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUv-0003t0-AV for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:57 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:58680 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUt-0008TR-5N for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086694; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YTkyBykFkXbbk86GGkCUTC7xRyB9nfmDNLeqhsrCO9M=; b=P2UUK5HNeeee/r8sv6K92gWj66HbvAV+c4DvAtHQ8ASHggj98Rgz4lp1+zE8t6pjfAc8Ir XesXk2Bfyrb80uAIfQkgiJxi1n+oIml1zhPphIhGZVSJIoF3IMdfEJwGS4cDBD/cZxFQTu NZVVYq0v7uICszAG/Gm9CP8adnS2siM= 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-256-JivF25oUPYKVwEA8vXah_g-1; Wed, 02 Sep 2020 18:44:52 -0400 X-MC-Unique: JivF25oUPYKVwEA8vXah_g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCE971074642 for ; Wed, 2 Sep 2020 22:44:51 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85F44100EBBE; Wed, 2 Sep 2020 22:44:51 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 36/63] can: Rename PCM3680i_PCI_DEV to PCM3680_PCI Date: Wed, 2 Sep 2020 18:42:44 -0400 Message-Id: <20200902224311.1321159-37-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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: Jason Wang , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Jason Wang Cc: qemu-devel@nongnu.org --- hw/net/can/can_pcm3680_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 530cd04a5d..cb9db3c322 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -44,7 +44,7 @@ #define TYPE_PCM3680_PCI "pcm3680_pci" typedef struct Pcm3680iPCIState Pcm3680iPCIState; -DECLARE_INSTANCE_CHECKER(Pcm3680iPCIState, PCM3680i_PCI_DEV, +DECLARE_INSTANCE_CHECKER(Pcm3680iPCIState, PCM3680_PCI, TYPE_PCM3680_PCI) /* the PCI device and vendor IDs */ @@ -76,7 +76,7 @@ struct Pcm3680iPCIState { static void pcm3680i_pci_reset(DeviceState *dev) { - Pcm3680iPCIState *d = PCM3680i_PCI_DEV(dev); + Pcm3680iPCIState *d = PCM3680_PCI(dev); int i; for (i = 0; i < PCM3680i_PCI_SJA_COUNT; i++) { @@ -156,7 +156,7 @@ static const MemoryRegionOps pcm3680i_pci_sja2_io_ops = { static void pcm3680i_pci_realize(PCIDevice *pci_dev, Error **errp) { - Pcm3680iPCIState *d = PCM3680i_PCI_DEV(pci_dev); + Pcm3680iPCIState *d = PCM3680_PCI(pci_dev); uint8_t *pci_conf; int i; @@ -190,7 +190,7 @@ static void pcm3680i_pci_realize(PCIDevice *pci_dev, Error **errp) static void pcm3680i_pci_exit(PCIDevice *pci_dev) { - Pcm3680iPCIState *d = PCM3680i_PCI_DEV(pci_dev); + Pcm3680iPCIState *d = PCM3680_PCI(pci_dev); int i; for (i = 0; i < PCM3680i_PCI_SJA_COUNT; i++) { @@ -217,7 +217,7 @@ static const VMStateDescription vmstate_pcm3680i_pci = { static void pcm3680i_pci_instance_init(Object *obj) { - Pcm3680iPCIState *d = PCM3680i_PCI_DEV(obj); + Pcm3680iPCIState *d = PCM3680_PCI(obj); object_property_add_link(obj, "canbus0", TYPE_CAN_BUS, (Object **)&d->canbus[0], From patchwork Wed Sep 2 22:42:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274756 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 94141C433E2 for ; Wed, 2 Sep 2020 23:01:58 +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 4CD3720767 for ; Wed, 2 Sep 2020 23:01:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RTfVb4oP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CD3720767 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]:44854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDblN-0005AW-7x for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:01:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUz-00044M-DJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:01 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:45320 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUx-0008UM-He for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086698; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zq9LSe6jW4K7WL54MmIxfbLjOQyXbELHR988rh4CKe0=; b=RTfVb4oPUMfVxCmC7u2t2RGWnryjugdME70V9plM5LBmkys2nq/O198rEqgWpGv/9/99Nj 0FOIVsbppLe+GaEJW+6Ect8N08mX5cXov6qVpL+kM9D7Ab4aS9HhmZevFFckzt9dX1fyHk GUvikcxcg2b9+o4rAFady4ylZxRJ/AM= 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-403-5tyNOB5eM-WJzmkxFfx9gg-1; Wed, 02 Sep 2020 18:44:57 -0400 X-MC-Unique: 5tyNOB5eM-WJzmkxFfx9gg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28082801AAE for ; Wed, 2 Sep 2020 22:44:56 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94B2760C0F; Wed, 2 Sep 2020 22:44:52 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 37/63] ccid-card-emulated: Rename EMULATED_CCID_CARD to EMULATED_CCID Date: Wed, 2 Sep 2020 18:42:45 -0400 Message-Id: <20200902224311.1321159-38-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: berrange@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- hw/usb/ccid-card-emulated.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 5e4649d367..9803dac5b7 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -47,7 +47,7 @@ do {\ #define TYPE_EMULATED_CCID "ccid-card-emulated" typedef struct EmulatedState EmulatedState; -DECLARE_INSTANCE_CHECKER(EmulatedState, EMULATED_CCID_CARD, +DECLARE_INSTANCE_CHECKER(EmulatedState, EMULATED_CCID, TYPE_EMULATED_CCID) #define BACKEND_NSS_EMULATED_NAME "nss-emulated" @@ -138,7 +138,7 @@ struct EmulatedState { static void emulated_apdu_from_guest(CCIDCardState *base, const uint8_t *apdu, uint32_t len) { - EmulatedState *card = EMULATED_CCID_CARD(base); + EmulatedState *card = EMULATED_CCID(base); EmulEvent *event = (EmulEvent *)g_malloc(sizeof(EmulEvent) + len); assert(event); @@ -155,7 +155,7 @@ static void emulated_apdu_from_guest(CCIDCardState *base, static const uint8_t *emulated_get_atr(CCIDCardState *base, uint32_t *len) { - EmulatedState *card = EMULATED_CCID_CARD(base); + EmulatedState *card = EMULATED_CCID(base); *len = card->atr_length; return card->atr; @@ -488,7 +488,7 @@ static uint32_t parse_enumeration(char *str, static void emulated_realize(CCIDCardState *base, Error **errp) { - EmulatedState *card = EMULATED_CCID_CARD(base); + EmulatedState *card = EMULATED_CCID(base); VCardEmulError ret; const EnumTable *ptable; @@ -564,7 +564,7 @@ out1: static void emulated_unrealize(CCIDCardState *base) { - EmulatedState *card = EMULATED_CCID_CARD(base); + EmulatedState *card = EMULATED_CCID(base); VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL); vevent_queue_vevent(vevent); /* stop vevent thread */ From patchwork Wed Sep 2 22:42:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274754 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 C37B1C433E7 for ; Wed, 2 Sep 2020 23:04:01 +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 76D5420767 for ; Wed, 2 Sep 2020 23:04:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RxQDVGAU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76D5420767 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]:53230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbnM-00006E-7M for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:04:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbV3-0004DZ-7Q for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbV1-0008W3-CT for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086702; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vP+1cnoEiRRF/Veskzjah97JOmeQT5Sjpx4NEsWWbnQ=; b=RxQDVGAUjuBpnBaYcTEIao/QMwF2rlBOJb1A1uQA8QOStxw6dIRGj5SoUEBMZcVM0T5tum QhkZV6PIiP64sb8JcFCpcpygbrJdLItyMsZSOK70mlWt5kwltYC1kj8GqOwnEfR/BToKs8 ZwskRKWVmP+4d2MCYRqbMA4F+EAYmbI= 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-140-EUGyTUulNP-PZ5vq3A1GNQ-1; Wed, 02 Sep 2020 18:45:01 -0400 X-MC-Unique: EUGyTUulNP-PZ5vq3A1GNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3808810059A8 for ; Wed, 2 Sep 2020 22:45:00 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 168B37E313; Wed, 2 Sep 2020 22:44:56 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 38/63] ccid-card-passthru: Rename PASSTHRU_CCID_CARD to CCID_PASSTHRU Date: Wed, 2 Sep 2020 18:42:46 -0400 Message-Id: <20200902224311.1321159-39-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: berrange@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- hw/usb/ccid-card-passthru.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index e8e9d37e88..d9f569e201 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -65,7 +65,7 @@ struct PassthruState { }; #define TYPE_CCID_PASSTHRU "ccid-card-passthru" -DECLARE_INSTANCE_CHECKER(PassthruState, PASSTHRU_CCID_CARD, +DECLARE_INSTANCE_CHECKER(PassthruState, CCID_PASSTHRU, TYPE_CCID_PASSTHRU) /* @@ -332,7 +332,7 @@ static void ccid_card_vscard_event(void *opaque, QEMUChrEvent event) static void passthru_apdu_from_guest( CCIDCardState *base, const uint8_t *apdu, uint32_t len) { - PassthruState *card = PASSTHRU_CCID_CARD(base); + PassthruState *card = CCID_PASSTHRU(base); if (!qemu_chr_fe_backend_connected(&card->cs)) { printf("ccid-passthru: no chardev, discarding apdu length %d\n", len); @@ -343,7 +343,7 @@ static void passthru_apdu_from_guest( static const uint8_t *passthru_get_atr(CCIDCardState *base, uint32_t *len) { - PassthruState *card = PASSTHRU_CCID_CARD(base); + PassthruState *card = CCID_PASSTHRU(base); *len = card->atr_length; return card->atr; @@ -351,7 +351,7 @@ static const uint8_t *passthru_get_atr(CCIDCardState *base, uint32_t *len) static void passthru_realize(CCIDCardState *base, Error **errp) { - PassthruState *card = PASSTHRU_CCID_CARD(base); + PassthruState *card = CCID_PASSTHRU(base); card->vscard_in_pos = 0; card->vscard_in_hdr = 0; From patchwork Wed Sep 2 22:42:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274757 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9C024C433E2 for ; Wed, 2 Sep 2020 23:01:12 +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 527C120767 for ; Wed, 2 Sep 2020 23:01:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BgMHcAZA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 527C120767 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]:41400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbkd-0003kr-Bq for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVM-00050u-Dq for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVK-0000CL-ID for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086721; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LPvt2YxAC/aD8bzK1fAzTLbNHtbMlQjhfsCbmemzqxQ=; b=BgMHcAZA8qbT1DvPXIf8jr9vCYAQX9Of72HEVOGlRnPXsAvsr3zFmxgRXpqGjJyOMB6Est tHpcl3hCuoDojbqtXmRt0Gihcgnycf/S29J0FjERk/K9NpJfk+MqZtWBWl8h1oeNgqQcBU gPc8DdbLl/ntOwsjkisfB8yLTBBQQ9I= 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-301-OsVO4KZiOh-7W4qgbUI4eg-1; Wed, 02 Sep 2020 18:45:18 -0400 X-MC-Unique: OsVO4KZiOh-7W4qgbUI4eg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 197138030C7; Wed, 2 Sep 2020 22:45:17 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 875F01C4; Wed, 2 Sep 2020 22:45:13 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI Date: Wed, 2 Sep 2020 18:42:53 -0400 Message-Id: <20200902224311.1321159-46-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Magnus Damm , Paolo Bonzini , berrange@redhat.com, Yoshinori Sato , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Yoshinori Sato Cc: Magnus Damm Cc: "Marc-André Lureau" Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- include/hw/char/renesas_sci.h | 2 +- hw/char/renesas_sci.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/char/renesas_sci.h b/include/hw/char/renesas_sci.h index a4764e3eee..1349d2d003 100644 --- a/include/hw/char/renesas_sci.h +++ b/include/hw/char/renesas_sci.h @@ -15,7 +15,7 @@ #define TYPE_RENESAS_SCI "renesas-sci" typedef struct RSCIState RSCIState; -DECLARE_INSTANCE_CHECKER(RSCIState, RSCI, +DECLARE_INSTANCE_CHECKER(RSCIState, RENESAS_SCI, TYPE_RENESAS_SCI) enum { diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index 5d7c6e6523..286fd28a39 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -70,7 +70,7 @@ REG8(SEMR, 7) static int can_receive(void *opaque) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (sci->rx_next > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)) { return 0; } else { @@ -80,7 +80,7 @@ static int can_receive(void *opaque) static void receive(void *opaque, const uint8_t *buf, int size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); sci->rx_next = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + sci->trtime; if (FIELD_EX8(sci->ssr, SSR, RDRF) || size > 1) { sci->ssr = FIELD_DP8(sci->ssr, SSR, ORER, 1); @@ -112,7 +112,7 @@ static void send_byte(RSCIState *sci) static void txend(void *opaque) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (!FIELD_EX8(sci->ssr, SSR, TDRE)) { send_byte(sci); } else { @@ -143,7 +143,7 @@ static bool sci_is_tr_enabled(RSCIState *sci) static void sci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); switch (offset) { case A_SMR: @@ -208,7 +208,7 @@ static void sci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) static uint64_t sci_read(void *opaque, hwaddr offset, unsigned size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); switch (offset) { case A_SMR: @@ -246,7 +246,7 @@ static const MemoryRegionOps sci_ops = { static void rsci_reset(DeviceState *dev) { - RSCIState *sci = RSCI(dev); + RSCIState *sci = RENESAS_SCI(dev); sci->smr = sci->scr = 0x00; sci->brr = 0xff; sci->tdr = 0xff; @@ -259,7 +259,7 @@ static void rsci_reset(DeviceState *dev) static void sci_event(void *opaque, QEMUChrEvent event) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (event == CHR_EVENT_BREAK) { sci->ssr = FIELD_DP8(sci->ssr, SSR, FER, 1); if (FIELD_EX8(sci->scr, SCR, RIE)) { @@ -270,7 +270,7 @@ static void sci_event(void *opaque, QEMUChrEvent event) static void rsci_realize(DeviceState *dev, Error **errp) { - RSCIState *sci = RSCI(dev); + RSCIState *sci = RENESAS_SCI(dev); if (sci->input_freq == 0) { qemu_log_mask(LOG_GUEST_ERROR, @@ -284,7 +284,7 @@ static void rsci_realize(DeviceState *dev, Error **errp) static void rsci_init(Object *obj) { SysBusDevice *d = SYS_BUS_DEVICE(obj); - RSCIState *sci = RSCI(obj); + RSCIState *sci = RENESAS_SCI(obj); int i; memory_region_init_io(&sci->memory, OBJECT(sci), &sci_ops, From patchwork Wed Sep 2 22:42:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274755 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 55BB0C433E2 for ; Wed, 2 Sep 2020 23:03:04 +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 11FF320767 for ; Wed, 2 Sep 2020 23:03:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P0qSlJkV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11FF320767 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]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbmR-0007Cq-5x for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:03:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVP-000587-74 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54497 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVN-0000Co-Dw for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086724; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9FBdGQF5umYvf1I4Fmj1epORUcpYXFDe6yX8hiqVwLI=; b=P0qSlJkVwhKeMoxiemJu8Gd/vMoxdz2EOp3f6qpmVxW/KSw3Of0uze7wTwpThHInsxQGXt rGLZApc2fuzAeSqrdZb7uq9sikKHqwnrwrm9XwNkKtL/JXHRheDX1ANYXpjsoesbQ2RwHQ 2iZM2Q8Lp6M+qR+2SJ9+Z/79LGW4gbc= 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-497-X715yCL3MyydLCc7BRtFHw-1; Wed, 02 Sep 2020 18:45:22 -0400 X-MC-Unique: X715yCL3MyydLCc7BRtFHw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 898DD1074642; Wed, 2 Sep 2020 22:45:19 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2A9B18B59; Wed, 2 Sep 2020 22:45:18 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC Date: Wed, 2 Sep 2020 18:42:55 -0400 Message-Id: <20200902224311.1321159-48-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:25:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: qemu-ppc@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , berrange@redhat.com, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé --- Cc: "Hervé Poussineau" Cc: David Gibson Cc: qemu-ppc@nongnu.org Cc: qemu-devel@nongnu.org --- hw/ppc/rs6000_mc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index 56e96010b8..8611ffa96d 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -30,7 +30,7 @@ #define TYPE_RS6000MC "rs6000-mc" typedef struct RS6000MCState RS6000MCState; -DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC_DEVICE, +DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC, TYPE_RS6000MC) struct RS6000MCState { @@ -143,7 +143,7 @@ static const MemoryRegionPortio rs6000mc_port_list[] = { static void rs6000mc_realize(DeviceState *dev, Error **errp) { - RS6000MCState *s = RS6000MC_DEVICE(dev); + RS6000MCState *s = RS6000MC(dev); int socket = 0; unsigned int ram_size = s->ram_size / MiB; Error *local_err = NULL; From patchwork Wed Sep 2 22:42:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274753 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A4FF2C433E7 for ; Wed, 2 Sep 2020 23:05:06 +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 67FBF20767 for ; Wed, 2 Sep 2020 23:05:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Efd8h0tF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67FBF20767 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]:58320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDboP-0002DE-Gy for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:05:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVQ-0005Ac-7e for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVO-0000D0-5d for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086725; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KlgzwG9LMNP5KR5cuY0HArWP1u2TlaKf9DQrTHmB+ew=; b=Efd8h0tFm5hCe5hrg9Po6Tt/mPaCG3GbqrOCzLEMA2J49N4RUScSyMUe3LThHS7LXhCiT5 LHimpIVtWYqhFVQOH6Uu6A3MTODMoBMuUSfeBmvto+d20omHrRGF9hggj/mWKu9j1yvC/r KEE1bYLAsJ18I37myPtLbk+zwRzyHRQ= 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-240--gKsb3FoM36zxIjT0kj9fw-1; Wed, 02 Sep 2020 18:45:22 -0400 X-MC-Unique: -gKsb3FoM36zxIjT0kj9fw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9198E18A2256; Wed, 2 Sep 2020 22:45:21 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53B467E313; Wed, 2 Sep 2020 22:45:21 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER Date: Wed, 2 Sep 2020 18:42:57 -0400 Message-Id: <20200902224311.1321159-50-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Peter Maydell , Alistair Francis , berrange@redhat.com, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Alistair Francis Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/timer/stm32f2xx_timer.h | 2 +- hw/timer/stm32f2xx_timer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h index 90f40f1746..70ef426afc 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -63,7 +63,7 @@ #define TYPE_STM32F2XX_TIMER "stm32f2xx-timer" typedef struct STM32F2XXTimerState STM32F2XXTimerState; -DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XXTIMER, +DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XX_TIMER, TYPE_STM32F2XX_TIMER) struct STM32F2XXTimerState { diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index ba8694dcd3..d880c0b4d5 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -96,7 +96,7 @@ static void stm32f2xx_timer_set_alarm(STM32F2XXTimerState *s, int64_t now) static void stm32f2xx_timer_reset(DeviceState *dev) { - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); s->tim_cr1 = 0; @@ -306,7 +306,7 @@ static Property stm32f2xx_timer_properties[] = { static void stm32f2xx_timer_init(Object *obj) { - STM32F2XXTimerState *s = STM32F2XXTIMER(obj); + STM32F2XXTimerState *s = STM32F2XX_TIMER(obj); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); @@ -317,7 +317,7 @@ static void stm32f2xx_timer_init(Object *obj) static void stm32f2xx_timer_realize(DeviceState *dev, Error **errp) { - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, stm32f2xx_timer_interrupt, s); } From patchwork Wed Sep 2 22:42:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274750 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 C707FC433E2 for ; Wed, 2 Sep 2020 23:08:06 +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 8DDBA20767 for ; Wed, 2 Sep 2020 23:08:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KkE0Y1r/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DDBA20767 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]:43968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbrJ-0007w9-Ni for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVR-0005Dy-Ly for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43597 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVP-0000DT-PF for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086727; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+HqocEVt3IjTtTEYyuQs0S10647C8sqQ/V5hlLQKIcI=; b=KkE0Y1r/+Zycyns9qnsEfNRQVlwz6hy/HXvEBQI+JFjX0Ujj1IxsPtPm0Y3E6CSmntRgVd KudZZ1az5qc0llMq/8nTtH4pJCdVbNxHKYzVqf87aOYOwgBivZ4N75Wxt/5owdhAoZRbfY N3Fr5HhXfUF1YPzTeZRykUyuzEkNp3E= 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-229-XJtxKrB2OcKm-n0QdgEKOQ-1; Wed, 02 Sep 2020 18:45:24 -0400 X-MC-Unique: XJtxKrB2OcKm-n0QdgEKOQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 792681005E65; Wed, 2 Sep 2020 22:45:23 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4898C100EBBE; Wed, 2 Sep 2020 22:45:23 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 51/63] tpm_spapr: Rename VIO_SPAPR_VTPM to TPM_SPAPR Date: Wed, 2 Sep 2020 18:42:59 -0400 Message-Id: <20200902224311.1321159-52-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:25:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: berrange@redhat.com, Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Stefan Berger --- Cc: Stefan Berger Cc: qemu-devel@nongnu.org --- hw/tpm/tpm_spapr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index e3775adc57..aa86d5f943 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -31,7 +31,7 @@ #define DEBUG_SPAPR 0 typedef struct SpaprTpmState SpaprTpmState; -DECLARE_INSTANCE_CHECKER(SpaprTpmState, VIO_SPAPR_VTPM, +DECLARE_INSTANCE_CHECKER(SpaprTpmState, TPM_SPAPR, TYPE_TPM_SPAPR) typedef struct TpmCrq { @@ -132,7 +132,7 @@ static inline int spapr_tpm_send_crq(struct SpaprVioDevice *dev, TpmCrq *crq) static int tpm_spapr_do_crq(struct SpaprVioDevice *dev, uint8_t *crq_data) { - SpaprTpmState *s = VIO_SPAPR_VTPM(dev); + SpaprTpmState *s = TPM_SPAPR(dev); TpmCrq local_crq; TpmCrq *crq = &s->crq; /* requests only */ int rc; @@ -235,7 +235,7 @@ static int tpm_spapr_do_crq(struct SpaprVioDevice *dev, uint8_t *crq_data) static void tpm_spapr_request_completed(TPMIf *ti, int ret) { - SpaprTpmState *s = VIO_SPAPR_VTPM(ti); + SpaprTpmState *s = TPM_SPAPR(ti); TpmCrq *crq = &s->crq; uint32_t len; int rc; @@ -283,7 +283,7 @@ static int tpm_spapr_do_startup_tpm(SpaprTpmState *s, size_t buffersize) static const char *tpm_spapr_get_dt_compatible(SpaprVioDevice *dev) { - SpaprTpmState *s = VIO_SPAPR_VTPM(dev); + SpaprTpmState *s = TPM_SPAPR(dev); switch (s->be_tpm_version) { case TPM_VERSION_1_2: @@ -297,7 +297,7 @@ static const char *tpm_spapr_get_dt_compatible(SpaprVioDevice *dev) static void tpm_spapr_reset(SpaprVioDevice *dev) { - SpaprTpmState *s = VIO_SPAPR_VTPM(dev); + SpaprTpmState *s = TPM_SPAPR(dev); s->state = SPAPR_VTPM_STATE_NONE; s->numbytes = 0; @@ -316,7 +316,7 @@ static void tpm_spapr_reset(SpaprVioDevice *dev) static enum TPMVersion tpm_spapr_get_version(TPMIf *ti) { - SpaprTpmState *s = VIO_SPAPR_VTPM(ti); + SpaprTpmState *s = TPM_SPAPR(ti); if (tpm_backend_had_startup_error(s->be_driver)) { return TPM_VERSION_UNSPEC; @@ -377,7 +377,7 @@ static Property tpm_spapr_properties[] = { static void tpm_spapr_realizefn(SpaprVioDevice *dev, Error **errp) { - SpaprTpmState *s = VIO_SPAPR_VTPM(dev); + SpaprTpmState *s = TPM_SPAPR(dev); if (!tpm_find()) { error_setg(errp, "at most one TPM device is permitted"); From patchwork Wed Sep 2 22:43:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274749 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BD332C43461 for ; Wed, 2 Sep 2020 23:08:39 +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 8833F20767 for ; Wed, 2 Sep 2020 23:08:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SJZILhiK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8833F20767 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]:46536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbrq-0000Yg-Nf for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:08:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVY-0005Tz-DM for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVW-0000EU-JZ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086733; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n8njlJtaJj7gUgdzu22Fq+OTbGsCGwjHFqn3d8OwH9M=; b=SJZILhiK4lLyhZkVij1y0TzK+8eFtog6y4mf6/RLBox9OM6/DMiyWZ0anf2GQPX3/C/z7Q gcqNdaNLYkfKD1YqXzk8pbjobV9ZQTxr32LDAYtBxQVocEzr/FV7lzJ2aoSuXVhkwQy84S B3TkigIttz6xP1Gmuxyko3tdWtot6xA= 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-142-5nb_l6GVOvOifF5sI_Ra4w-1; Wed, 02 Sep 2020 18:45:32 -0400 X-MC-Unique: 5nb_l6GVOvOifF5sI_Ra4w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 397EE801AE0; Wed, 2 Sep 2020 22:45:31 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F0C11002D40; Wed, 2 Sep 2020 22:45:27 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL Date: Wed, 2 Sep 2020 18:43:01 -0400 Message-Id: <20200902224311.1321159-54-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Samuel Thibault , berrange@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé --- Cc: Gerd Hoffmann Cc: Samuel Thibault Cc: qemu-devel@nongnu.org --- hw/usb/dev-serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 1a58851d4b..1a038a222e 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -113,7 +113,7 @@ struct USBSerialState { typedef struct USBSerialState USBSerialState; #define TYPE_USB_SERIAL "usb-serial-dev" -DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL_DEV, +DECLARE_INSTANCE_CHECKER(USBSerialState, USB_SERIAL, TYPE_USB_SERIAL) enum { @@ -517,7 +517,7 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event) static void usb_serial_realize(USBDevice *dev, Error **errp) { - USBSerialState *s = USB_SERIAL_DEV(dev); + USBSerialState *s = USB_SERIAL(dev); Error *local_err = NULL; usb_desc_create_serial(dev); From patchwork Wed Sep 2 22:43:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274748 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 7F4E9C433E2 for ; Wed, 2 Sep 2020 23:09:46 +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 44D1520767 for ; Wed, 2 Sep 2020 23:09:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PCDBebXb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44D1520767 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]:52106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbsv-0002rx-Fl for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:09:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVd-0005fF-3t for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVb-0000Eq-9i for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086738; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VvizHAmeZMzi5ksn/YUPmtfcYhTkdeqSRpKS2+BNn4Q=; b=PCDBebXbNM7IjYZU2nF3c/PmWxqKjwjN/TgzR9pt3ryoRc9kcdpVgi9K2YEtQEHYp11ETL RrerBMb4Yadc751lEFwnqQdI7YR+PZ74P0CR6AwREL1oSYdoqjWxauyIqy2W0ugg3CjD9B kitPoWvonZ1JoXuAXpAWsqEnHPLsLHc= 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-23-5ST8YiQtOcCTfGY_WiqXbQ-1; Wed, 02 Sep 2020 18:45:36 -0400 X-MC-Unique: 5ST8YiQtOcCTfGY_WiqXbQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F1628030C7 for ; Wed, 2 Sep 2020 22:45:36 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id E77EB19C59; Wed, 2 Sep 2020 22:45:31 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 54/63] usb: Rename USB_STORAGE_DEV to USB_STORAGE Date: Wed, 2 Sep 2020 18:43:02 -0400 Message-Id: <20200902224311.1321159-55-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: berrange@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Gerd Hoffmann Cc: qemu-devel@nongnu.org --- hw/usb/dev-storage.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 648340323f..bbc5d904bf 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -70,7 +70,7 @@ struct MSDState { typedef struct MSDState MSDState; #define TYPE_USB_STORAGE "usb-storage-dev" -DECLARE_INSTANCE_CHECKER(MSDState, USB_STORAGE_DEV, +DECLARE_INSTANCE_CHECKER(MSDState, USB_STORAGE, TYPE_USB_STORAGE) struct usb_msd_cbw { @@ -400,7 +400,7 @@ static void usb_msd_handle_control(USBDevice *dev, USBPacket *p, static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p) { - MSDState *s = USB_STORAGE_DEV(dev); + MSDState *s = USB_STORAGE(dev); assert(s->packet == p); s->packet = NULL; @@ -605,7 +605,7 @@ static const struct SCSIBusInfo usb_msd_scsi_info_bot = { static void usb_msd_storage_realize(USBDevice *dev, Error **errp) { - MSDState *s = USB_STORAGE_DEV(dev); + MSDState *s = USB_STORAGE(dev); BlockBackend *blk = s->conf.blk; SCSIDevice *scsi_dev; @@ -656,7 +656,7 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp) static void usb_msd_bot_realize(USBDevice *dev, Error **errp) { - MSDState *s = USB_STORAGE_DEV(dev); + MSDState *s = USB_STORAGE(dev); DeviceState *d = DEVICE(dev); usb_desc_create_serial(dev); @@ -725,7 +725,7 @@ static void usb_msd_get_bootindex(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { USBDevice *dev = USB_DEVICE(obj); - MSDState *s = USB_STORAGE_DEV(dev); + MSDState *s = USB_STORAGE(dev); visit_type_int32(v, name, &s->conf.bootindex, errp); } @@ -734,7 +734,7 @@ static void usb_msd_set_bootindex(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { USBDevice *dev = USB_DEVICE(obj); - MSDState *s = USB_STORAGE_DEV(dev); + MSDState *s = USB_STORAGE(dev); int32_t boot_index; Error *local_err = NULL; From patchwork Wed Sep 2 22:43:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274747 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 49CD5C433E7 for ; Wed, 2 Sep 2020 23:10:56 +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 10C3820767 for ; Wed, 2 Sep 2020 23:10:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YsH2GvZL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10C3820767 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]:56716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbu3-0004q1-9L for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:10:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVi-0005sj-Je for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVg-0000GP-L7 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086743; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X6p9hUMEUii+QrtRAZHxiv7M9kayxspGCtythkhQRiA=; b=YsH2GvZLuaj+ZKmQ8/e20LIbYtTfZbVTeTWkH/o2peWCgu+Z9FS+s/KJuOfcgFR66vLbLM hAY9yiApdSJjAcz6KR13WRep9LuuPXbcpIb4Ex9NOJUplxRb9CNQgInzfpv25+U6xGZHPB n3+NXGzbGPCvK47KqHWsKjlNT++DYO8= 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-232-rOtJufE2MD2dj8rG8sNKWQ-1; Wed, 02 Sep 2020 18:45:41 -0400 X-MC-Unique: rOtJufE2MD2dj8rG8sNKWQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37731801AEA for ; Wed, 2 Sep 2020 22:45:40 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2579D7E313; Wed, 2 Sep 2020 22:45:37 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 55/63] vfio: Rename PCI_VFIO to VFIO_PCI Date: Wed, 2 Sep 2020 18:43:03 -0400 Message-Id: <20200902224311.1321159-56-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Alex Williamson , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Eric Auger --- Cc: Alex Williamson Cc: qemu-devel@nongnu.org --- hw/vfio/pci.h | 2 +- hw/vfio/pci.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index 846d60e56c..5e53d5b863 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -116,7 +116,7 @@ typedef struct VFIOMSIXInfo { #define TYPE_VFIO_PCI "vfio-pci" typedef struct VFIOPCIDevice VFIOPCIDevice; -DECLARE_INSTANCE_CHECKER(VFIOPCIDevice, PCI_VFIO, +DECLARE_INSTANCE_CHECKER(VFIOPCIDevice, VFIO_PCI, TYPE_VFIO_PCI) struct VFIOPCIDevice { diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 3611dcd38b..0d83eb0e47 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -230,7 +230,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) static void vfio_intx_routing_notifier(PCIDevice *pdev) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); PCIINTxRoute route; if (vdev->interrupt != VFIO_INT_INTx) { @@ -456,7 +456,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg, static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, MSIMessage *msg, IOHandler *handler) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); VFIOMSIVector *vector; int ret; @@ -541,7 +541,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev, static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); VFIOMSIVector *vector = &vdev->msi_vectors[nr]; trace_vfio_msix_vector_release(vdev->vbasedev.name, nr); @@ -1048,7 +1048,7 @@ static const MemoryRegionOps vfio_vga_ops = { */ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); VFIORegion *region = &vdev->bars[bar].region; MemoryRegion *mmap_mr, *region_mr, *base_mr; PCIIORegion *r; @@ -1094,7 +1094,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) */ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val; memcpy(&emu_bits, vdev->emulated_config_bits + addr, len); @@ -1127,7 +1127,7 @@ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr, uint32_t val, int len) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); uint32_t val_le = cpu_to_le32(val); trace_vfio_pci_write_config(vdev->vbasedev.name, addr, val, len); @@ -2701,7 +2701,7 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev) static void vfio_realize(PCIDevice *pdev, Error **errp) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); VFIODevice *vbasedev_iter; VFIOGroup *group; char *tmp, *subsys, group_path[PATH_MAX], *group_name; @@ -3033,7 +3033,7 @@ error: static void vfio_instance_finalize(Object *obj) { - VFIOPCIDevice *vdev = PCI_VFIO(obj); + VFIOPCIDevice *vdev = VFIO_PCI(obj); VFIOGroup *group = vdev->vbasedev.group; vfio_display_finalize(vdev); @@ -3057,7 +3057,7 @@ static void vfio_instance_finalize(Object *obj) static void vfio_exitfn(PCIDevice *pdev) { - VFIOPCIDevice *vdev = PCI_VFIO(pdev); + VFIOPCIDevice *vdev = VFIO_PCI(pdev); vfio_unregister_req_notifier(vdev); vfio_unregister_err_notifier(vdev); @@ -3075,7 +3075,7 @@ static void vfio_exitfn(PCIDevice *pdev) static void vfio_pci_reset(DeviceState *dev) { - VFIOPCIDevice *vdev = PCI_VFIO(dev); + VFIOPCIDevice *vdev = VFIO_PCI(dev); trace_vfio_pci_reset(vdev->vbasedev.name); @@ -3115,7 +3115,7 @@ post_reset: static void vfio_instance_init(Object *obj) { PCIDevice *pci_dev = PCI_DEVICE(obj); - VFIOPCIDevice *vdev = PCI_VFIO(obj); + VFIOPCIDevice *vdev = VFIO_PCI(obj); device_add_bootindex_property(obj, &vdev->bootindex, "bootindex", NULL, From patchwork Wed Sep 2 22:43:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274752 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 3F690C433E2 for ; Wed, 2 Sep 2020 23:05:58 +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 047AA20767 for ; Wed, 2 Sep 2020 23:05:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Lm5AppXL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 047AA20767 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]:33810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbpF-0003mi-66 for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVk-0005wY-9u for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVi-0000Ge-Iw for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086745; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aEO9A2LYblcm/I6NgIoHd4bW4w0x2saH7By6ITYGNEo=; b=Lm5AppXLehuC3AcSRy7RBRprfvqpn9ow30duhj/pSf7UBswUeyl9lcLNXCIwa8OErN1EFn TPfNeT/8mNVtXU9IES1jVrMFO41lgQJvhxh9mlbOa3TrF2bg5qs/tZMtx/KacEZ1eqkGwH GWo8mbrU7GQAzajla/IEjUzEpWqwNNI= 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-314-fsHEkTwZMIefxME4tZWlIQ-1; Wed, 02 Sep 2020 18:45:44 -0400 X-MC-Unique: fsHEkTwZMIefxME4tZWlIQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43C2E1074642; Wed, 2 Sep 2020 22:45:43 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07F457E313; Wed, 2 Sep 2020 22:45:42 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 58/63] hvf: Rename HVF_STATE to HVF_ACCEL Date: Wed, 2 Sep 2020 18:43:06 -0400 Message-Id: <20200902224311.1321159-59-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Roman Bolshakov , berrange@redhat.com, Cameron Esfahani Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Cameron Esfahani Cc: Roman Bolshakov Cc: qemu-devel@nongnu.org --- include/sysemu/hvf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index 1398679458..195795e857 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -37,7 +37,7 @@ void hvf_vcpu_destroy(CPUState *); #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME("hvf") typedef struct HVFState HVFState; -DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE, +DECLARE_INSTANCE_CHECKER(HVFState, HVF_ACCEL, TYPE_HVF_ACCEL) #endif From patchwork Wed Sep 2 22:43:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 274751 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BAA97C433E7 for ; Wed, 2 Sep 2020 23:07:15 +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 7FA8720767 for ; Wed, 2 Sep 2020 23:07:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PgYtUdoi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FA8720767 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]:40196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbqU-0006Pm-Jt for qemu-devel@archiver.kernel.org; Wed, 02 Sep 2020 19:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVn-00063W-6a for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVk-0000H0-NS for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086747; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s3S/AszU2npuLFVGLRWKun644Qipz/7LELQUErE38aE=; b=PgYtUdoinguoYjcMj7rDhz3zFp9iy27Ej5A8VwX3JmWfFcJhcGuwI9d+8kUSr++Cuxs5zQ nKsvtcXMnsWfHo5JZAsUlCxybfaMqPAIZlwtoj+pSc09ZwlBsxILPaWzfuBr3v9bVQClk6 bEQwmzwGQdNeu68icnktcPXwavd/OmI= 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-464-WfnT9OXwPEq_0bYcoJZenA-1; Wed, 02 Sep 2020 18:45:46 -0400 X-MC-Unique: WfnT9OXwPEq_0bYcoJZenA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 902CA1074642; Wed, 2 Sep 2020 22:45:45 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AC6918B59; Wed, 2 Sep 2020 22:45:45 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 60/63] tcg: Rename TCG_STATE to TCG_ACCEL Date: Wed, 2 Sep 2020 18:43:08 -0400 Message-Id: <20200902224311.1321159-61-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Paolo Bonzini , berrange@redhat.com, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Richard Henderson Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org --- accel/tcg/tcg-all.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 7098ad96c3..08d82e5c03 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -46,7 +46,7 @@ typedef struct TCGState TCGState; #define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg") -DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE, +DECLARE_INSTANCE_CHECKER(TCGState, TCG_ACCEL, TYPE_TCG_ACCEL) /* mask must never be zero, except for A20 change call */ @@ -118,14 +118,14 @@ static bool default_mttcg_enabled(void) static void tcg_accel_instance_init(Object *obj) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); s->mttcg_enabled = default_mttcg_enabled(); } static int tcg_init(MachineState *ms) { - TCGState *s = TCG_STATE(current_accel()); + TCGState *s = TCG_ACCEL(current_accel()); tcg_exec_init(s->tb_size * 1024 * 1024); cpu_interrupt_handler = tcg_handle_interrupt; @@ -135,14 +135,14 @@ static int tcg_init(MachineState *ms) static char *tcg_get_thread(Object *obj, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); return g_strdup(s->mttcg_enabled ? "multi" : "single"); } static void tcg_set_thread(Object *obj, const char *value, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); if (strcmp(value, "multi") == 0) { if (TCG_OVERSIZED_GUEST) { @@ -172,7 +172,7 @@ static void tcg_get_tb_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); uint32_t value = s->tb_size; visit_type_uint32(v, name, &value, errp); @@ -182,7 +182,7 @@ static void tcg_set_tb_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - TCGState *s = TCG_STATE(obj); + TCGState *s = TCG_ACCEL(obj); uint32_t value; if (!visit_type_uint32(v, name, &value, errp)) {