From aae049073c5b5797ca3d11cc562f0bcd0a20cfb5 Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Thu, 24 Jan 2019 20:16:06 +0530 Subject: hw: edu: set category of the edu device Sets the category of edu device as DEVICE_CATEGORY_MISC. Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Thomas Huth Message-Id: <20190124144606.4352-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/misc/edu.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'hw') diff --git a/hw/misc/edu.c b/hw/misc/edu.c index ceaf688..91af452 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -399,6 +399,7 @@ static void edu_instance_init(Object *obj) static void edu_class_init(ObjectClass *class, void *data) { + DeviceClass *dc = DEVICE_CLASS(class); PCIDeviceClass *k = PCI_DEVICE_CLASS(class); k->realize = pci_edu_realize; @@ -407,6 +408,7 @@ static void edu_class_init(ObjectClass *class, void *data) k->device_id = 0x11e8; k->revision = 0x10; k->class_id = PCI_CLASS_OTHERS; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static void pci_edu_register_types(void) -- cgit v1.1 From 89cb0c0403f27cdb040fc8bf84749333f3248e38 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 25 Jan 2019 09:40:46 +0000 Subject: typo: apci->acpi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apci_1_compatible should be acpi_1_compatible. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190125094047.22276-1-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- hw/acpi/cpu.c | 2 +- hw/i386/acpi-build.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index f10b190..a0a43fe 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -508,7 +508,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, GArray *madt_buf = g_array_new(0, 1, 1); int arch_id = arch_ids->cpus[i].arch_id; - if (opts.apci_1_compatible && arch_id < 255) { + if (opts.acpi_1_compatible && arch_id < 255) { dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i); } else { dev = aml_device(CPU_NAME_FMT, i); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2e21a31..d60603a 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1847,7 +1847,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); } else { CPUHotplugFeatures opts = { - .apci_1_compatible = true, .has_legacy_cphp = true + .acpi_1_compatible = true, .has_legacy_cphp = true }; build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base, "\\_SB.PCI0", "\\_GPE._E02"); -- cgit v1.1 From cbe9ed73f905b532918603c04807bfa84d6051fb Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Fri, 25 Jan 2019 20:44:40 +0530 Subject: hw: input: set category of the i8042 device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sets the category of i8042 device as DEVICE_CATEGORY_INPUT Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-Id: <20190125151440.13794-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/input/pckbd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'hw') diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 3e66713..72e7d5f 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -574,6 +574,7 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) dc->realize = i8042_realizefn; dc->vmsd = &vmstate_kbd_isa; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo i8042_info = { -- cgit v1.1 From 2bbf3a91eb49aba488f586a06d15eb555a36e1e6 Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Thu, 24 Jan 2019 21:50:45 +0530 Subject: hw: sd: set category of the sd memory card MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sets the category of the sd memory card as DEVICE_CATEGORY_STORAGE. Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20190124162045.10474-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/sd/sd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'hw') diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d4356e9..aaab15f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2121,6 +2121,7 @@ static void sd_class_init(ObjectClass *klass, void *data) dc->vmsd = &sd_vmstate; dc->reset = sd_reset; dc->bus_type = TYPE_SD_BUS; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); sc->set_voltage = sd_set_voltage; sc->get_dat_lines = sd_get_dat_lines; -- cgit v1.1 From 36f1f0d26eeec59c842a061603946f7c5ace4941 Mon Sep 17 00:00:00 2001 From: Paul Durrant Date: Tue, 22 Jan 2019 14:51:32 +0000 Subject: hw/block: clean up stale xen_disk trace entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should have been removed then xen_disk.c was removed but I missed them. Fixes: 19f87870baa570bcd7e80e7657e030bf427f16be xen: remove the legacy 'xen_disk' backend Signed-off-by: Paul Durrant Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190122145132.12571-1-paul.durrant@citrix.com> [lv: s/stake/stale/ and add "Fixes" tag] Signed-off-by: Laurent Vivier --- hw/block/trace-events | 7 ------- 1 file changed, 7 deletions(-) (limited to 'hw') diff --git a/hw/block/trace-events b/hw/block/trace-events index 55e5a55..d085195 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -121,13 +121,6 @@ nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" -# hw/block/xen_disk.c -xen_disk_alloc(char *name) "%s" -xen_disk_init(char *name) "%s" -xen_disk_connect(char *name) "%s" -xen_disk_disconnect(char *name) "%s" -xen_disk_free(char *name) "%s" - # hw/block/xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" xen_block_connect(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" -- cgit v1.1 From 95b3c9cfd5eaaa4a2a4afa1eaf09612a94ade1da Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Wed, 30 Jan 2019 10:52:31 +0100 Subject: virtio-blk: remove duplicate definition of VirtIOBlock *s pointer VirtIOBlock *s is already defined and initialized with req->dev on top of virtio_blk_handle_request(), so we can remove it from the code block of VIRTIO_BLK_T_GET_ID case. Signed-off-by: Stefano Garzarella Reviewed-by: Thomas Huth Message-Id: <20190130095231.42081-1-sgarzare@redhat.com> Signed-off-by: Laurent Vivier --- hw/block/virtio-blk.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'hw') diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f208c6d..9a87b3b 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -569,8 +569,6 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) break; case VIRTIO_BLK_T_GET_ID: { - VirtIOBlock *s = req->dev; - /* * NB: per existing s/n string convention the string is * terminated by '\0' only when shorter than buffer. -- cgit v1.1