From nobody Mon Feb 9 01:06:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1584458305; cv=none; d=zohomail.com; s=zohoarc; b=TD3mM5LDE6S02m67MZxLwUdLvYavJCrerKyzA5QpoML/O5RQnlk7BB1V4aj1J2r/JChxEkFzsnkP4vz3Ri7hVeniKIi7J3G9dWo4lOAh5MenI31hePpBf26E9sk3HrhhGWB+V504rMBMxddGGcTY6JrOlHMKbKONFgUTcBiLh3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584458305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bSTmyRoRhIFLYb+dmzJ3LAwkQ2SpB6tqsfRdb74XiVM=; b=b73pY9/SRbivUpTh6mVU/ppJk7rC4oVItUQFD/B3cBXuYOoISsBt6lL7II0knucKg7wpX/NP039G6zVStOQ/TIMf3JrqmkDAzDJnaDhUOHByk04aDJTMFx7eQJiXkvD4NcAElApb67pBi+dUTtaKQ9LqWIxQjmi/6qYdwwtTH3g= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584458305326201.46607280946625; Tue, 17 Mar 2020 08:18:25 -0700 (PDT) Received: from localhost ([::1]:34570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEDz6-0004Vx-8m for importer@patchew.org; Tue, 17 Mar 2020 11:18:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58729) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEDuh-0007BJ-PX for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEDug-0001Yu-GS for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:51 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:49490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEDuc-000184-Ij; Tue, 17 Mar 2020 11:13:47 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 05BFF747E1B; Tue, 17 Mar 2020 16:13:43 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 71B36747E12; Tue, 17 Mar 2020 16:13:42 +0100 (CET) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v3 7/8] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h Date: Tue, 17 Mar 2020 16:05:37 +0100 MIME-Version: 1.0 To: qemu-devel@nongnu.org, qemu-block@nongnu.org Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:738:2001:2001::2001 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: Eduardo Habkost , "Michael S. Tsirkin" , John Snow , Mark Cave-Ayland , Markus Armbruster , hpoussin@reactos.org, Aleksandar Markovic , Paolo Bonzini , philmd@redhat.com, Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We can move this define now that less files use it to internal.h to further reduce dependency on hw/ide.h. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Markus Armbruster --- hw/mips/mips_r4k.c | 1 + include/hw/ide.h | 2 -- include/hw/ide/internal.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index ad8b75e286..3487013a4a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" +#include "hw/ide/internal.h" #include "hw/loader.h" #include "elf.h" #include "hw/rtc/mc146818rtc.h" diff --git a/include/hw/ide.h b/include/hw/ide.h index d52c211f32..c5ce5da4f4 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -4,8 +4,6 @@ #include "hw/isa/isa.h" #include "exec/memory.h" =20 -#define MAX_IDE_DEVS 2 - /* ide-isa.c */ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1); diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 1bc1fc73e5..55da35d768 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -27,6 +27,8 @@ typedef struct IDEDMAOps IDEDMAOps; #define TYPE_IDE_BUS "IDE" #define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) =20 +#define MAX_IDE_DEVS 2 + /* Bits of HD_STATUS */ #define ERR_STAT 0x01 #define INDEX_STAT 0x02 --=20 2.21.1