From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547039896367625.8238294203603; Wed, 9 Jan 2019 05:18:16 -0800 (PST) Received: from localhost ([127.0.0.1]:36046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDkN-0007Gg-8z for importer@patchew.org; Wed, 09 Jan 2019 08:18:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDef-00036I-Qg for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDbz-0000HW-Mb for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:37 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:50849) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbp-00009U-MA; Wed, 09 Jan 2019 08:09:27 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MMY9X-1gxvVX3zIF-00JZPM; Wed, 09 Jan 2019 14:08:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:39 +0100 Message-Id: <20190109130844.5172-2-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:TlPVI3BIUb8Ige1p52gQshXzRcrKhFAqxm5g6Jzjpo1GaZKmzNT a+KXeVGl/LxIxk1AZytlrsy8+x2xGiXcaLxPKKoX+QDzIEjhcq8eW8eaMH1nA8+BhuHY2Zh eF1gSUvtF8IyNxXxlaHT4x4gMwR/98RgsNLHk8MQtl4V6a11BaT31hmnxcIq8Aqm3jTI1DO JMv7Wg/qRnzSYRm9Bq+nA== X-UI-Out-Filterresults: notjunk:1;V03:K0:X95vxnZKfO4=:37aqTx8m5ogS/dywdrwXQk Q+uF9Pxczi9dxtEzpvqaRaqTCFtlJNgMjMqv49N15bo4T3HibKZHZctW3meLVMyR9m9l6opnb /fPwnVs1cQOzXePtslsjvKJkX2QCr4wvzII+1UB0qtofeIMEwnX3Goa8/lNzHRQ2mKY6LmjOe 0JMKh2nH4ZlHjgVVlEJT/B1lMGv2aST60GlKFqmXBMDp1qrr+JK1hEvqCnMw/CIvds2Fbw7Tg sYHt/ozSAIwOtsxkNsaXXlKmAmg1t4O740JSIWjthZ9Gt33o1NqjUN12dsRBVzkfdGunY++a5 pfzFzu4T6T7JBuO9YmInBfH4hwq63aFhr1cOIjXs8MxcY4QprfWiRKG9xQw9CatM+imkQlxyz jaiCjzjc/O+b3FrNN16VceEh6Ohfvkoc6g37U+ZhseR5sao54qBHYsWxyLkwjfEzm5NAmTAoD vUZe+z/FB7dIo/qhsKvcNeUXtTLCf6F7rncb4rJeFTBKEpKPAM7e1abZj7bTGGHhjPngzNfXp RLW9bT8PboCxxaqQ1rHnH2ygAD7TElCCiTX4gOecHRiH+gpXvbPP6JXxfvSzKITbzYV+8cPvx MyV9YoolTmmLpQhCoBYDwBgnegSLcdl6AJEyq+ABgmvFkU6NJeyG+BQpZ3gXG13YXkIEkLc7f Owd2RVHnpF4JFjrpo/hEnwdiblKwO1PdKgs42aPjCiL0PiJhmnw8Y/7zNjv2RZV4Em4jbNKWZ J8ECdDHbF2Vflg/uTqCrEiT8J3vltrNXb+mEQhuG2OPrvbaF83ksvH/sHjU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 1/6] typedefs: (Re-)sort entries alphabetically 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: Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Markus Armbruster , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake Since the last time we sorted things (2988cbeaf), we've had a few relapses that were inserted out of order. Also, we had more entries that were sorted case-insensitively than not, so let's document that convention and stick to it. Signed-off-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Message-Id: <20181115211752.1295571-2-eblake@redhat.com> Signed-off-by: Laurent Vivier --- include/qemu/typedefs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index d59df20c4d..741935fe36 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -4,7 +4,7 @@ /* A load of opaque types so that device init declarations don't have to pull in all the real definitions. */ =20 -/* Please keep this list in alphabetical order */ +/* Please keep this list in case-insensitive alphabetical order */ typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; @@ -40,6 +40,7 @@ typedef struct HCIInfo HCIInfo; typedef struct HVFX86EmulatorState HVFX86EmulatorState; typedef struct I2CBus I2CBus; typedef struct I2SCodec I2SCodec; +typedef struct IOMMUMemoryRegion IOMMUMemoryRegion; typedef struct ISABus ISABus; typedef struct ISADevice ISADevice; typedef struct IsaDma IsaDma; @@ -49,7 +50,6 @@ typedef struct MachineState MachineState; typedef struct MemoryListener MemoryListener; typedef struct MemoryMappingList MemoryMappingList; typedef struct MemoryRegion MemoryRegion; -typedef struct IOMMUMemoryRegion IOMMUMemoryRegion; typedef struct MemoryRegionCache MemoryRegionCache; typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; @@ -84,6 +84,8 @@ typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; typedef struct PS2State PS2State; +typedef struct QBool QBool; +typedef struct QDict QDict; typedef struct QEMUBH QEMUBH; typedef struct QemuConsole QemuConsole; typedef struct QemuDmaBuf QemuDmaBuf; @@ -93,12 +95,10 @@ typedef struct QemuMutex QemuMutex; typedef struct QemuOpt QemuOpt; typedef struct QemuOpts QemuOpts; typedef struct QemuOptsList QemuOptsList; -typedef struct QemuSpin QemuSpin; typedef struct QEMUSGList QEMUSGList; +typedef struct QemuSpin QemuSpin; typedef struct QEMUTimer QEMUTimer; typedef struct QEMUTimerListGroup QEMUTimerListGroup; -typedef struct QBool QBool; -typedef struct QDict QDict; typedef struct QJSON QJSON; typedef struct QList QList; typedef struct QNull QNull; --=20 2.20.1 From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547039838585760.2052649776653; Wed, 9 Jan 2019 05:17:18 -0800 (PST) Received: from localhost ([127.0.0.1]:35803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDjR-0006YQ-Gv for importer@patchew.org; Wed, 09 Jan 2019 08:17:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeZ-0002zH-OY for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDc4-0000NN-At for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:41 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:37655) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbm-00008h-G8; Wed, 09 Jan 2019 08:09:23 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MlsWZ-1h7ieH1ZPH-00j2M8; Wed, 09 Jan 2019 14:08:58 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:40 +0100 Message-Id: <20190109130844.5172-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ebbmJ/kMcCm8S0YKvyTW72w1/gy2msEqaWMQxOFdi7wQgN/sJtr TVedsCwNiT6Cq40nCq4ZsZLmXE0QjcQKVTqkU0FRUMtTMDlACZORkkzzHI1aRo4fad7OEJJ 0motCutmz678LQcQJpyuNVRGNPpSi9rSmjimAOeWm38OtHP9pKB8H6hKg5btqmErhhjmw46 8o9H6PfyQaGF80VsK5+ag== X-UI-Out-Filterresults: notjunk:1;V03:K0:Qcu3PCtDvRY=:26Y4LwA9wi0K5BcFgfk3Od vpZ5SF4fH9hZ5YHoRY+GXKgodykg1CXwgliGfU+UtAwQ+Av/4Gi+RjB1wwBlrY8KuE2ZaK2CR IDBQt+NEdID8Ash+4XQQp34BA7FrsMm4onaGjuiyQb0UIqYaKBpBFwuM02k3MuL4bkWIeaSN5 A8+pwjIknziQ9XqSzjX7zxsY0TNQ6K7inJY4luw1syo4xYgTsMmodyY8i4xi+DdtEbU4+UTUY Led1NjhmuiB7NgHZkahTqFEGqKVDf5KKTFzSSvwGO0BeqKsV7QACc1op5g1wKYeVh0KuNhIR2 S662zd4CGS/3HTMIcbrRy+CTQG52rXBR6HU47tJx1SzhCmv6qc5oV9oe4Afi/YQW7lKxZ/Js4 kFtrV5IzgAuqERNN2ViLbo4JRtyaT7tHG2JjtWIYBp9OnfByuinY3tJYwTXXDCMolKQeWlJSC N32eJkqZ/3KX0tkW/Ov9gpxuawpFPHaPG62gnl2WPoPl0sfW/SzHmUDtbbeYrRT1ph79HTnW8 SznhyNYqqGGsDB9I8Nikm2qc+MvpmzRrvmkDmvCMeCcF7Oy06PSqrDecc7avKoJd7cmrDOW4p 5Su/BBDUVziPQl+OO8ccOug0slIFxqXXCrWQGgIz1R1oEWG2S7VQp+Flsr9R84qISWf3aLTUB 4w5/GNbAqWxNriEmAEibpGFhqaTuBh5HddEph4vpmLnAuTjd1W+uuO5IGa0Ox2g9o5pc9kGNs Mkgq601+bFShT4zDNBT7iX8iaHwW0/j84R2L9cv0CaSrY/NxdSLDCl1L2qE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 2/6] hw/core: fix whitespace in a sentence 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: Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20181224154922.3338-1-wainersm@redhat.com> Signed-off-by: Laurent Vivier --- hw/core/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index f8563efb86..1a0a9ab111 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -919,7 +919,7 @@ static void machine_class_init(ObjectClass *oc, void *d= ata) object_class_property_add_bool(oc, "dump-guest-core", machine_get_dump_guest_core, machine_set_dump_guest_core, &error_a= bort); object_class_property_set_description(oc, "dump-guest-core", - "Include guest memory in a core dump", &error_abort); + "Include guest memory in a core dump", &error_abort); =20 object_class_property_add_bool(oc, "mem-merge", machine_get_mem_merge, machine_set_mem_merge, &error_abort); --=20 2.20.1 From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547039897991313.54142617442835; Wed, 9 Jan 2019 05:18:17 -0800 (PST) Received: from localhost ([127.0.0.1]:36053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDkP-0007Hc-1l for importer@patchew.org; Wed, 09 Jan 2019 08:18:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeX-0002z4-UJ for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDc5-0000SF-Ky for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:42 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:46249) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbz-0000Ec-Gw; Wed, 09 Jan 2019 08:09:35 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MjBNV-1hAUcI46VR-00fFFq; Wed, 09 Jan 2019 14:09:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:41 +0100 Message-Id: <20190109130844.5172-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:z+DJUB0MWDZdmTm0vS6X3uH8zc+yGvWaOXH2QX6XImucEK1XHSS MlOCPa+FrKgmMTXwAkxDR/0dpSSgul/r4iZlBln456dQig06goaUVAsH7f5br0OnF3yjtwE pPsT5jfReJ4O6m0ZEoizAO4oiXCLrcDfQ32Z5+2KeJk/nTNAsiK7aHqQJwKfwnsjAb2IarR genDbgrHj+16cMdhVdHig== X-UI-Out-Filterresults: notjunk:1;V03:K0:rbcjEW9bXYY=:/7opPXSoOeezOOiV0guBO8 ctbQ6MMDVfufAX6t0hYLl1BXhliiAQkvKezA7AFtDPXpAK3hskrXrppgXioeCLDG/Nf7P1OA4 yoChDdOzGiHlftShug7GcSMZDNmQXz7hA1BhxJz4/CntXcwo7ilLL/prAEpQM3hfpGW0d7bTy CkjkmDb+1rvFEweAd4HSSGNgFYrIaLBpvqcnpvalAquDRI7JDsm050HFGTsIWnFlsX7JzIvSM 52HbX6V/pN+/LBPXN7tx8MzDrHGaunRF875l2G51cs6nWSUuRmm0m5giOBxTyFWZLSNbcLuDu DsZYxLVor/M75BQt5GKoHQBn12ryovEo3dYkioYNpXt2ayWO32t9QGIPaKoOk3CPPjRCB4BdM Jz3uvbrPJQOFNm693j2TJoALvVCEZCRiERG/tuOfBQGMn4L3pJlnXcy9eOEKRNuOh4J1yCFMy kJJqTXuadT65C2QmcRhgE6qn6I11y8jahCSJITlRfynPfa0X38/AxULqO1IFk7ET433aNDwXw 85evHgspSORyJSxJOQPZGNWWQ6aCcqyIC66mGtcaB9W/Fg2xX9Yt7i3ndXQ5xNCbZ63wRAoJw jgR7VRcRYPd8tL5QeSuxaMsrDR5vcLTI1paSawys324NOJ7dbjv9ZxQygXia2T3/kpWQj1h1c b45vNSSbs+7EaipTfl6AnY37SY/O6eO+aD+F6rcIAr4suEXy1PQJ8xmHVH2cePczfP6LSYw8L rWTi4CSQiEBpMEURjWJ1SmudZ6QZrfyftH0uKmkfETDOF0vhLmwDHnWf3fo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 3/6] qom: Include qemu/fprintf-fn.h in cpu.h 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: Priit Laes , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Priit Laes QOM cpu.h uses fprintf_function which requires Qemu's qemu/fprintf-fn.h header. Include it. Signed-off-by: Priit Laes Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20181226003722.31257-1-plaes@plaes.org> Signed-off-by: Laurent Vivier --- include/qom/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 1396f53e5b..6d1ba53d72 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -26,6 +26,7 @@ #include "exec/memattrs.h" #include "qapi/qapi-types-run-state.h" #include "qemu/bitmap.h" +#include "qemu/fprintf-fn.h" #include "qemu/rcu_queue.h" #include "qemu/queue.h" #include "qemu/thread.h" --=20 2.20.1 From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547039691671960.6921351285913; Wed, 9 Jan 2019 05:14:51 -0800 (PST) Received: from localhost ([127.0.0.1]:35215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDgv-0004hj-3m for importer@patchew.org; Wed, 09 Jan 2019 08:14:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeX-0002zH-U4 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDc5-0000Ot-05 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:42 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:57903) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbz-0000EK-Go; Wed, 09 Jan 2019 08:09:35 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N0Zfg-1hSIRt1kTU-00wV7j; Wed, 09 Jan 2019 14:09:01 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:42 +0100 Message-Id: <20190109130844.5172-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:zFog74qFr6jfDAJZtrQ8v/ricCXyaU1qOwsOdl6f61yAcj3eXVx UaE10aN29i8tu8vUIk30YYrozosVeHAyVsgAF/tjR6BFPA4F5oC7nGtow4XkJviL/dJA96H fwe+B1hKy6yoZlNY80ctHlDAub6iuVW8CBgte2IGTUeSh2zEDsa3MnxwILfV3t3y778v06M fu8EyL7US3o/QIMr4MgqA== X-UI-Out-Filterresults: notjunk:1;V03:K0:s5K+itDi2t8=:zXTgCpmPVHshVvd7QWjMj+ zu53DkRgu7MgACu3NVowpsIrpsm4ToKOz6FlU8fY7vLpf2RhS1iBrtydc5wL9UdXY4tC1BB05 0tlbAnAnLGOxtO7McFy7hYNzgEztK53OQEoPp2GfCQzCHMBkb8K3imQ6mf0npZSZJCbuScau4 jwv49iIEsxBgVuBedQFIZ1npd9KYuEjblVKvpj2zjI6mdYCwh5KptZbHH4ml0DsQGr/4Hg60q d9y1OFLx1RDyvEzgww1RujQTOLz/wyzvbd9CNuWQWvdfpcujLEhZnBNMh0uJ9ABj7nDnX3CXP HqWWQUVyCzNls1WfXryMzuua5ngWqTuJpwJqnySSY1qU0zj5bZO4wIaB3wWuUQXCWPjie6Jdy rF5rFftLazsLWxYs1ZDhDOY5Bq5upJHvrYyFJI5Lphb5bJNTihAQxH8/ryh3mz9MlffHuSbJh q8fpflfFUKXhXbt8+mlJUi0pfxp58XzSYXs6V6+Fb7AIBOpMcYj1+2r4MsRA0Ya8lxtmQcGrg xAp8gvR+6t6cnXSkjl100tDbDD5YsYZt7yjEVuXmjW7PqyTL1Fconnsu0mwfF8+2onTE80dpi 3GZHNKBTSAFxJXhB71SORahji94zpO34RyKxdH1eDhBqiCSZev+7h6Nrw8u96p9qpgWWv/hu8 ikvL9qwuC9tZ33alFVGfBU5PIBBGtV607fg/+bgqFf2x+2Z8CJiRUHCZA5PyLOl67cPhb8dwt YWYBuPDFMPdBOYUMGJezgynZvo3u0LPz26vDnQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 4/6] hw/audio/marvell: Don't include unnecessary i2c.h header file 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: Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Thomas Huth This device does not use I2C, so no need to include the header file here. Signed-off-by: Thomas Huth Message-Id: <1546614146-10525-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/audio/marvell_88w8618.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 6600ab4851..035dd76cbf 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/i2c/i2c.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "qapi/error.h" --=20 2.20.1 From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547039812824905.7653463556173; Wed, 9 Jan 2019 05:16:52 -0800 (PST) Received: from localhost ([127.0.0.1]:35697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDj1-0006Fm-PK for importer@patchew.org; Wed, 09 Jan 2019 08:16:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeY-0002z4-P8 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDc5-0000Qk-8h for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:42 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:37887) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbx-0000EN-Mx; Wed, 09 Jan 2019 08:09:35 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mxpqo-1hV3Kq3UQo-00zEwb; Wed, 09 Jan 2019 14:09:03 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:43 +0100 Message-Id: <20190109130844.5172-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Z8jMPlYuPWwSDIj+swcdxAEI7yNcBv1vVC/uYq9gmcHQIHPx0AE 64hGQFGoiz5NThPZcUrV7nhQt1UyInoiZMEehW4wJRAditBe+AVgFNHGeOLjYYeaG4OOf6g Ryb0W8U0fjAIdzkbazicr7G5CSIQukHzpVj4re0m3Z+Vmyz83FCKpFybOSZMfns4AKek41m EM5i9QGyQPxMlNf4zPMkw== X-UI-Out-Filterresults: notjunk:1;V03:K0:tCg1ywP6uSk=:ccZNcbNNrDZ/raMV5zk2vI B7J8zLHfygO08VZyytZ7grL5lVnjJG5ZHpaCkQGanJCPmiF5XZPVC6bEZooDL8UMWVCxMsBIP kvs0dJtE1kObUYLyqLvz+sfLCnHcg4+DBgOxrwAfQsZLdyQWwaQur/cyy+BBYUtEXZ69cwZAq g3ar/HmewP2HptNKOHMH+JUle1jg92c0T6JIN9yNnseb3ChWMZf+e1jfJZOmDOBtr59EbaAAL i08OfUg5nZy9WvX5oJBjZq8hPaEH4++dGYp1ClVU5d7NW8RIux1mIbLuwyly8/UpwKM1KCfSW O5BdH99S5/ksHIWWSLAyF5XI9+pSRIApoYFfhYPXID4GyyWGyjuYv7jmMYl/HTp85CBPTOIjd rM/nN0TJ2PnHgOECiv4uhfziTW10+OgZgOitaezMp/wBGRRiFnAcOUW+7oRU4Tq1mXjfFz37k ha7KnOxiFPl0iBqOAL5MNjLircnBadm2YNtt4ipxc0/AHzqLJxhS6cgX6HuZOh5vjC6eNeY30 BTHg1EM7sqlFyfRVQe6Daz3mlBbWVZUNVDwFtNtf1ECzKxdi4KsRfu4wLh4I/KBZbMgEEYDC7 c74EE7Lp+7YC81JZokX0hF4YiBZ1ZIEa9owk5WG6bjOhiwdbgwCmPEA5sIdHlQFAJcLXqdG5u vecFC0y1aygMrcUeKyzKGq4FPlI75FTwmq7K/sLLL1g61BLU2YkZFpEl4OQfm0pYKzQbdE3BS 41rFAR3mgurR4sXBLg6G3O079/5+qIVpXfzHFQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 5/6] trivial: Don't include isa.h if it is not really necessary 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: Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Thomas Huth These files don't seem to do anything related to ISA directly, so there is no need to include isa.h here. Signed-off-by: Thomas Huth Message-Id: <1546615943-16274-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/ramfb-standalone.c | 1 - hw/ide/pci.c | 1 - hw/ide/piix.c | 1 - hw/ide/via.c | 1 - hw/misc/macio/mac_dbdma.c | 1 - hw/moxie/moxiesim.c | 1 - hw/nvram/fw_cfg.c | 1 - hw/sparc/sun4m.c | 1 - hw/timer/i8254.c | 1 - 9 files changed, 9 deletions(-) diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index c0d241ba01..da3229a1f6 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/loader.h" -#include "hw/isa/isa.h" #include "hw/display/ramfb.h" #include "ui/console.h" #include "sysemu/sysemu.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index fe1ceeb0cd..b75154f99f 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/isa/isa.h" #include "sysemu/dma.h" #include "qemu/error-report.h" #include "hw/ide/pci.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index a3afe1fd29..885c16e938 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 238f038d72..987d99c5ec 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/isa/isa.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" =20 diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index 87ae246d37..e5917d8f2e 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -38,7 +38,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/isa/isa.h" #include "hw/ppc/mac_dbdma.h" #include "qemu/main-loop.h" #include "qemu/log.h" diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 4b0ce09c5e..c6b6f7262d 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -31,7 +31,6 @@ #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index de58c7be46..53e8e010a8 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -27,7 +27,6 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "hw/boards.h" -#include "hw/isa/isa.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 639906cca3..709ee37e08 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -37,7 +37,6 @@ #include "net/net.h" #include "hw/boards.h" #include "hw/scsi/esp.h" -#include "hw/isa/isa.h" #include "hw/nvram/sun_nvram.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 1057850808..20f834e7da 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/isa/isa.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" --=20 2.20.1 From nobody Thu May 2 15:21:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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 1547040114997869.3551034740624; Wed, 9 Jan 2019 05:21:54 -0800 (PST) Received: from localhost ([127.0.0.1]:36911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDnp-0001h7-38 for importer@patchew.org; Wed, 09 Jan 2019 08:21:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghDeh-00032A-PT for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:12:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghDbx-0000Fe-LX for qemu-devel@nongnu.org; Wed, 09 Jan 2019 08:09:35 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:37439) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghDbr-00009x-H3; Wed, 09 Jan 2019 08:09:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M4KFF-1ggwcb13jN-000O8E; Wed, 09 Jan 2019 14:09:04 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 14:08:44 +0100 Message-Id: <20190109130844.5172-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109130844.5172-1-laurent@vivier.eu> References: <20190109130844.5172-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:/yB9ECdKhtQRTY1MgeTwiZKF1WVLcG/+fyJqYczaZSrPMS5l65j jUdWtHgfWj3tc2dj4MyxAwU55J4EcQyf/YK9nkAuvNHDvhZCtNfUKMOyZE+w+7iEQnNAm/L 684/w4gp/zWs6HjJD2vdtKZo/suMe8dkDBAFxbv60ia1sk4yZVCiJZCRWJqp1cM48NKk2hF i36t3gqcxrlp4q3SO2nYw== X-UI-Out-Filterresults: notjunk:1;V03:K0:d47CSabWAiw=:MW/DH0T0uGv27Ej5maTDvp LhI2Wi2NIQy8uzukHD0wXkSWHI8RUcgSVg0FO5nSL6xHAW19LeqbwaxbrRPdZhO8nuMJQQlwX eSBVtRJCvDSs1D/9mBIt27wmwv7s3OfqqbhEasz6u1j+AYDbP/CbDXOGVtd1K9/xgR9SnzFaD VdU7lkwp9eVOuNhc836TYDLXdjrtIALRp0D1xLlYkR35x/saXkgj66eCwvpbwK8Fmys5hecXB ebqb6iIo5xBlbzMeOTZj4TYPZsHgguuUsXiC5F9m7jJHhxWL8odt3sNETC5iw0CoXl2DFec2X hGtaJAsR+tv8QrPGNsi+ZtB7sqLzzS4jQI+7IK53UZy5540ejVBCEUGq8Xp6az6y7JqPlcPt5 COH5G+tkvmJwzAFh3HiCOsibJlPykse3kEDCp/T3lvyvStBrLuPMYnlRwYDsaic392ITSUWeH IMV9wKav2d0o+aS2ZbFqo+uimmkojo/MSVcjsr9IiStDYcGe5qFcc63PRjD5ICgXyMuMc+mD5 Fg+MTn0CDRQ3Fv+SWNOixyBgI0MPUTc0a6bHoQmAM3kJrpDAt0PZ84ETmCZCv93pWNYFl6Z5X S1l+34pBt40oM4wiCiaTrRst94d7uA5xjvtLTUti73UEfHFehGCgkwbcfXSbe3lWToLBo3cHd 3bNbXP1xMaTVFcW2bjIzbUM05rLq+ztb6UfT7EmO73QbaDShlll4ulb/zDDk6m02JEog7FL3+ LpT/lZUEM7CnQFYtaF1IKuLHk7omW2SQEFk1Tg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 6/6] ioapic: use TYPE_FOO MACRO than constant string 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: Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laszlo Ersek , Anthony Green , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Michael Tokarev , qemu-ppc@nongnu.org, Gerd Hoffmann , Li Qiang , Paolo Bonzini , Richard Henderson , John Snow , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Li Qiang Make them more QOMConventional. Cc:qemu-trivial@nongnu.org Signed-off-by: Li Qiang Reviewed-by: Laurent Vivier Message-Id: <20190105023831.66910-1-liq3ea@163.com> Signed-off-by: Laurent Vivier --- hw/i386/kvm/ioapic.c | 2 +- hw/i386/pc.c | 4 ++-- hw/intc/ioapic.c | 2 +- include/hw/i386/ioapic.h | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 5b40d75439..e453692199 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -163,7 +163,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo kvm_ioapic_info =3D { - .name =3D "kvm-ioapic", + .name =3D TYPE_KVM_IOAPIC, .parent =3D TYPE_IOAPIC_COMMON, .instance_size =3D sizeof(KVMIOAPICState), .class_init =3D kvm_ioapic_class_init, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4952feb476..3c9e20ad9c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2339,9 +2339,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char = *parent_name) unsigned int i; =20 if (kvm_ioapic_in_kernel()) { - dev =3D qdev_create(NULL, "kvm-ioapic"); + dev =3D qdev_create(NULL, TYPE_KVM_IOAPIC); } else { - dev =3D qdev_create(NULL, "ioapic"); + dev =3D qdev_create(NULL, TYPE_IOAPIC); } if (parent_name) { object_property_add_child(object_resolve_path(parent_name, NULL), diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 4e529729b4..9d75f84d3b 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -429,7 +429,7 @@ static void ioapic_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo ioapic_info =3D { - .name =3D "ioapic", + .name =3D TYPE_IOAPIC, .parent =3D TYPE_IOAPIC_COMMON, .instance_size =3D sizeof(IOAPICCommonState), .class_init =3D ioapic_class_init, diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h index 9c8816f11f..59fcb158a7 100644 --- a/include/hw/i386/ioapic.h +++ b/include/hw/i386/ioapic.h @@ -23,6 +23,9 @@ #define IOAPIC_NUM_PINS 24 #define IO_APIC_DEFAULT_ADDRESS 0xfec00000 =20 +#define TYPE_KVM_IOAPIC "kvm-ioapic" +#define TYPE_IOAPIC "ioapic" + void ioapic_eoi_broadcast(int vector); =20 #endif /* HW_IOAPIC_H */ --=20 2.20.1