From patchwork Sun Sep 30 08:12:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 976838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ObMQZ7YN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NK0S3sK1z9s3x for ; Sun, 30 Sep 2018 18:51:52 +1000 (AEST) Received: from localhost ([::1]:54425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6XSA-00051f-3C for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:51:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6WsB-00031e-Ez for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6WsA-0001FI-EX for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:39 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:33837) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6WsA-00014u-6h for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:38 -0400 Received: by mail-wm1-x341.google.com with SMTP id z25-v6so827484wmf.1 for ; Sun, 30 Sep 2018 01:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9RtAjS6d1Oi05tNE7XINNrEWVQnB8h6BteriYibNd0g=; b=ObMQZ7YN+sOiEJA6xfo1Ddv5tMEGBB12MG8Fp9B2WfmKn0Zzrfvadu2gW4C7xyquYs 8+DTWU3YISj+KfWOTZlbNAiH1kGg1HvPEhXTrgVd6oHtXOsqy0mTgvZXfsFM2IjB3bgX +UW7FBhgZaPmH7NVVkDXl20qt8oN3HHTtAEF9nDJcuw6lwZwcvVCKYEPxPIWVgWhF2Y+ c4CNkMrhVjHSGa//oWyg7cHzaL4AHQW7ii7BDJRIXMNDrIDVpB49M41BpFW0R8DuoKtF 9DbjwSewPs1FpfeH8yiVV4CMfIkCtpbPWylRS4YFoVvGWxnIuRJFoCU+m7/N8HHkmXu1 o4kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9RtAjS6d1Oi05tNE7XINNrEWVQnB8h6BteriYibNd0g=; b=ruKeF5Qg/T8MB21zkInig8G+5cLRuXdNjGgfawtBUoqMb27SpdtBnQBzExI9DNdeC4 yrYby6z9wskTgyM5YHTNXX/OSOwoKvx3yrQJctwe5ZLnyd2jVwr1gQZYTVqqq61kp89z +3R3j4adG/Yqk5ARthVdgO0oK4ZKWaroixYaqzHUwa9wd0ijVSYnxvZUy8cE4a+DNIuc R/zBXIpehFtVK9NeO9ewItvo4XLY7U1bVbMHazW4eWdZajmtiKGbfQS7TdwioAG+0MOk iKZvqI/C9OtqUW96texlGRvgV/z2yoePcx0DkByde06Qie9whkPO0DDlZVA9enzgfGOW sH3g== X-Gm-Message-State: ABuFfohslQi+SIiyE3m3+uqqkqNoRL33E6xycItQe5t7kHAC3bNFqGSu Wr2vaOFX16ar/yWkympX5kvIjoZd X-Google-Smtp-Source: ACcGV617r+apYepErPaJlFisOz5y1zT931/IqV7kl5NSsEK0YDQY4AILGdnKG6HDKhn9PfRYZnWTJA== X-Received: by 2002:a1c:b54b:: with SMTP id e72-v6mr5824497wmf.117.1538295259666; Sun, 30 Sep 2018 01:14:19 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:56 +0200 Message-Id: <1538295197-23704-59-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PULL 58/79] hw: edu: replace device name with macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang Just as other devices do. Signed-off-by: Li Qiang Message-Id: <1536901871-2729-1-git-send-email-liq3ea@gmail.com> Signed-off-by: Paolo Bonzini --- hw/misc/edu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index df26a4d..0687ffd 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -30,7 +30,8 @@ #include "qemu/main-loop.h" /* iothread mutex */ #include "qapi/visitor.h" -#define EDU(obj) OBJECT_CHECK(EduState, obj, "edu") +#define TYPE_PCI_EDU_DEVICE "edu" +#define EDU(obj) OBJECT_CHECK(EduState, obj, TYPE_PCI_EDU_DEVICE) #define FACT_IRQ 0x00000001 #define DMA_IRQ 0x00000100 @@ -414,7 +415,7 @@ static void pci_edu_register_types(void) { }, }; static const TypeInfo edu_info = { - .name = "edu", + .name = TYPE_PCI_EDU_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(EduState), .instance_init = edu_instance_init,