]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge commit 'df84f17' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 26 Oct 2019 13:36:22 +0000 (15:36 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 26 Oct 2019 13:38:02 +0000 (15:38 +0200)
This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1  2 
MAINTAINERS
hw/i386/acpi-build.c
hw/i386/microvm.c
hw/i386/pc.c
hw/i386/pc_q35.c
hw/rtc/mc146818rtc.c
include/hw/rtc/mc146818rtc.h
include/hw/rtc/mc146818rtc_regs.h
target/i386/cpu.c
tests/rtc-test.c

diff --cc MAINTAINERS
index 556ce0bfe35687e82691d3efc426a2a4c2753c9a,72ab731987ed82b352c7f1e03551e8607cb09f4a..42e702f34604dcbe2c2a1c06f7c1a3fb7625ef5f
@@@ -1273,8 -1273,17 +1273,17 @@@ F: include/hw/isa/i8259_internal.
  F: include/hw/isa/superio.h
  F: include/hw/timer/hpet.h
  F: include/hw/timer/i8254*
 -F: include/hw/timer/mc146818rtc*
 +F: include/hw/rtc/mc146818rtc*
  
+ microvm
+ M: Sergio Lopez <slp@redhat.com>
+ M: Paolo Bonzini <pbonzini@redhat.com>
+ S: Maintained
+ F: docs/microvm.rst
+ F: hw/i386/microvm.c
+ F: include/hw/i386/microvm.h
+ F: pc-bios/bios-microvm.bin
  Machine core
  M: Eduardo Habkost <ehabkost@redhat.com>
  M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Simple merge
index 0000000000000000000000000000000000000000,20d2189ea845858748711f441ba2a55d3a78846f..8aacd6c8d127169b4db89aaa37a29173efa37476
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,572 +1,572 @@@
 -#include "hw/timer/mc146818rtc.h"
+ /*
+  * Copyright (c) 2018 Intel Corporation
+  * Copyright (c) 2019 Red Hat, Inc.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms and conditions of the GNU General Public License,
+  * version 2 or later, as published by the Free Software Foundation.
+  *
+  * This program is distributed in the hope it will be useful, but WITHOUT
+  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  * more details.
+  *
+  * You should have received a copy of the GNU General Public License along with
+  * this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "qemu/osdep.h"
+ #include "qemu/error-report.h"
+ #include "qemu/cutils.h"
+ #include "qemu/units.h"
+ #include "qapi/error.h"
+ #include "qapi/visitor.h"
+ #include "qapi/qapi-visit-common.h"
+ #include "sysemu/sysemu.h"
+ #include "sysemu/cpus.h"
+ #include "sysemu/numa.h"
+ #include "sysemu/reset.h"
+ #include "hw/loader.h"
+ #include "hw/irq.h"
+ #include "hw/kvm/clock.h"
+ #include "hw/i386/microvm.h"
+ #include "hw/i386/x86.h"
+ #include "hw/i386/pc.h"
+ #include "target/i386/cpu.h"
+ #include "hw/timer/i8254.h"
++#include "hw/rtc/mc146818rtc.h"
+ #include "hw/char/serial.h"
+ #include "hw/i386/topology.h"
+ #include "hw/i386/e820_memory_layout.h"
+ #include "hw/i386/fw_cfg.h"
+ #include "hw/virtio/virtio-mmio.h"
+ #include "cpu.h"
+ #include "elf.h"
+ #include "kvm_i386.h"
+ #include "hw/xen/start_info.h"
+ #define MICROVM_BIOS_FILENAME "bios-microvm.bin"
+ static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s)
+ {
+     X86MachineState *x86ms = X86_MACHINE(mms);
+     int val;
+     val = MIN(x86ms->below_4g_mem_size / KiB, 640);
+     rtc_set_memory(s, 0x15, val);
+     rtc_set_memory(s, 0x16, val >> 8);
+     /* extended memory (next 64MiB) */
+     if (x86ms->below_4g_mem_size > 1 * MiB) {
+         val = (x86ms->below_4g_mem_size - 1 * MiB) / KiB;
+     } else {
+         val = 0;
+     }
+     if (val > 65535) {
+         val = 65535;
+     }
+     rtc_set_memory(s, 0x17, val);
+     rtc_set_memory(s, 0x18, val >> 8);
+     rtc_set_memory(s, 0x30, val);
+     rtc_set_memory(s, 0x31, val >> 8);
+     /* memory between 16MiB and 4GiB */
+     if (x86ms->below_4g_mem_size > 16 * MiB) {
+         val = (x86ms->below_4g_mem_size - 16 * MiB) / (64 * KiB);
+     } else {
+         val = 0;
+     }
+     if (val > 65535) {
+         val = 65535;
+     }
+     rtc_set_memory(s, 0x34, val);
+     rtc_set_memory(s, 0x35, val >> 8);
+     /* memory above 4GiB */
+     val = x86ms->above_4g_mem_size / 65536;
+     rtc_set_memory(s, 0x5b, val);
+     rtc_set_memory(s, 0x5c, val >> 8);
+     rtc_set_memory(s, 0x5d, val >> 16);
+ }
+ static void microvm_gsi_handler(void *opaque, int n, int level)
+ {
+     GSIState *s = opaque;
+     qemu_set_irq(s->ioapic_irq[n], level);
+ }
+ static void microvm_devices_init(MicrovmMachineState *mms)
+ {
+     X86MachineState *x86ms = X86_MACHINE(mms);
+     ISABus *isa_bus;
+     ISADevice *rtc_state;
+     GSIState *gsi_state;
+     int i;
+     /* Core components */
+     gsi_state = g_malloc0(sizeof(*gsi_state));
+     if (mms->pic == ON_OFF_AUTO_ON || mms->pic == ON_OFF_AUTO_AUTO) {
+         x86ms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
+     } else {
+         x86ms->gsi = qemu_allocate_irqs(microvm_gsi_handler,
+                                         gsi_state, GSI_NUM_PINS);
+     }
+     isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(),
+                           &error_abort);
+     isa_bus_irqs(isa_bus, x86ms->gsi);
+     ioapic_init_gsi(gsi_state, "machine");
+     kvmclock_create();
+     for (i = 0; i < VIRTIO_NUM_TRANSPORTS; i++) {
+         sysbus_create_simple("virtio-mmio",
+                              VIRTIO_MMIO_BASE + i * 512,
+                              x86ms->gsi[VIRTIO_IRQ_BASE + i]);
+     }
+     /* Optional and legacy devices */
+     if (mms->pic == ON_OFF_AUTO_ON || mms->pic == ON_OFF_AUTO_AUTO) {
+         qemu_irq *i8259;
+         i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
+         for (i = 0; i < ISA_NUM_IRQS; i++) {
+             gsi_state->i8259_irq[i] = i8259[i];
+         }
+         g_free(i8259);
+     }
+     if (mms->pit == ON_OFF_AUTO_ON || mms->pit == ON_OFF_AUTO_AUTO) {
+         if (kvm_pit_in_kernel()) {
+             kvm_pit_init(isa_bus, 0x40);
+         } else {
+             i8254_pit_init(isa_bus, 0x40, 0, NULL);
+         }
+     }
+     if (mms->rtc == ON_OFF_AUTO_ON ||
+         (mms->rtc == ON_OFF_AUTO_AUTO && !kvm_enabled())) {
+         rtc_state = mc146818_rtc_init(isa_bus, 2000, NULL);
+         microvm_set_rtc(mms, rtc_state);
+     }
+     if (mms->isa_serial) {
+         serial_hds_isa_init(isa_bus, 0, 1);
+     }
+     if (bios_name == NULL) {
+         bios_name = MICROVM_BIOS_FILENAME;
+     }
+     x86_bios_rom_init(get_system_memory(), true);
+ }
+ static void microvm_memory_init(MicrovmMachineState *mms)
+ {
+     MachineState *machine = MACHINE(mms);
+     X86MachineState *x86ms = X86_MACHINE(mms);
+     MemoryRegion *ram, *ram_below_4g, *ram_above_4g;
+     MemoryRegion *system_memory = get_system_memory();
+     FWCfgState *fw_cfg;
+     ram_addr_t lowmem;
+     int i;
+     /*
+      * Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory
+      * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
+      * also known as MMCFG).
+      * If it doesn't, we need to split it in chunks below and above 4G.
+      * In any case, try to make sure that guest addresses aligned at
+      * 1G boundaries get mapped to host addresses aligned at 1G boundaries.
+      */
+     if (machine->ram_size >= 0xb0000000) {
+         lowmem = 0x80000000;
+     } else {
+         lowmem = 0xb0000000;
+     }
+     /*
+      * Handle the machine opt max-ram-below-4g.  It is basically doing
+      * min(qemu limit, user limit).
+      */
+     if (!x86ms->max_ram_below_4g) {
+         x86ms->max_ram_below_4g = 4 * GiB;
+     }
+     if (lowmem > x86ms->max_ram_below_4g) {
+         lowmem = x86ms->max_ram_below_4g;
+         if (machine->ram_size - lowmem > lowmem &&
+             lowmem & (1 * GiB - 1)) {
+             warn_report("There is possibly poor performance as the ram size "
+                         " (0x%" PRIx64 ") is more then twice the size of"
+                         " max-ram-below-4g (%"PRIu64") and"
+                         " max-ram-below-4g is not a multiple of 1G.",
+                         (uint64_t)machine->ram_size, x86ms->max_ram_below_4g);
+         }
+     }
+     if (machine->ram_size > lowmem) {
+         x86ms->above_4g_mem_size = machine->ram_size - lowmem;
+         x86ms->below_4g_mem_size = lowmem;
+     } else {
+         x86ms->above_4g_mem_size = 0;
+         x86ms->below_4g_mem_size = machine->ram_size;
+     }
+     ram = g_malloc(sizeof(*ram));
+     memory_region_allocate_system_memory(ram, NULL, "microvm.ram",
+                                          machine->ram_size);
+     ram_below_4g = g_malloc(sizeof(*ram_below_4g));
+     memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram,
+                              0, x86ms->below_4g_mem_size);
+     memory_region_add_subregion(system_memory, 0, ram_below_4g);
+     e820_add_entry(0, x86ms->below_4g_mem_size, E820_RAM);
+     if (x86ms->above_4g_mem_size > 0) {
+         ram_above_4g = g_malloc(sizeof(*ram_above_4g));
+         memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram,
+                                  x86ms->below_4g_mem_size,
+                                  x86ms->above_4g_mem_size);
+         memory_region_add_subregion(system_memory, 0x100000000ULL,
+                                     ram_above_4g);
+         e820_add_entry(0x100000000ULL, x86ms->above_4g_mem_size, E820_RAM);
+     }
+     fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4,
+                                 &address_space_memory);
+     fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, machine->smp.cpus);
+     fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, machine->smp.max_cpus);
+     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size);
+     fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());
+     fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE,
+                      &e820_reserve, sizeof(e820_reserve));
+     fw_cfg_add_file(fw_cfg, "etc/e820", e820_table,
+                     sizeof(struct e820_entry) * e820_get_num_entries());
+     rom_set_fw(fw_cfg);
+     if (machine->kernel_filename != NULL) {
+         x86_load_linux(x86ms, fw_cfg, 0, true, true);
+     }
+     if (mms->option_roms) {
+         for (i = 0; i < nb_option_roms; i++) {
+             rom_add_option(option_rom[i].name, option_rom[i].bootindex);
+         }
+     }
+     x86ms->fw_cfg = fw_cfg;
+     x86ms->ioapic_as = &address_space_memory;
+ }
+ static gchar *microvm_get_mmio_cmdline(gchar *name)
+ {
+     gchar *cmdline;
+     gchar *separator;
+     long int index;
+     int ret;
+     separator = g_strrstr(name, ".");
+     if (!separator) {
+         return NULL;
+     }
+     if (qemu_strtol(separator + 1, NULL, 10, &index) != 0) {
+         return NULL;
+     }
+     cmdline = g_malloc0(VIRTIO_CMDLINE_MAXLEN);
+     ret = g_snprintf(cmdline, VIRTIO_CMDLINE_MAXLEN,
+                      " virtio_mmio.device=512@0x%lx:%ld",
+                      VIRTIO_MMIO_BASE + index * 512,
+                      VIRTIO_IRQ_BASE + index);
+     if (ret < 0 || ret >= VIRTIO_CMDLINE_MAXLEN) {
+         g_free(cmdline);
+         return NULL;
+     }
+     return cmdline;
+ }
+ static void microvm_fix_kernel_cmdline(MachineState *machine)
+ {
+     X86MachineState *x86ms = X86_MACHINE(machine);
+     BusState *bus;
+     BusChild *kid;
+     char *cmdline;
+     /*
+      * Find MMIO transports with attached devices, and add them to the kernel
+      * command line.
+      *
+      * Yes, this is a hack, but one that heavily improves the UX without
+      * introducing any significant issues.
+      */
+     cmdline = g_strdup(machine->kernel_cmdline);
+     bus = sysbus_get_default();
+     QTAILQ_FOREACH(kid, &bus->children, sibling) {
+         DeviceState *dev = kid->child;
+         ObjectClass *class = object_get_class(OBJECT(dev));
+         if (class == object_class_by_name(TYPE_VIRTIO_MMIO)) {
+             VirtIOMMIOProxy *mmio = VIRTIO_MMIO(OBJECT(dev));
+             VirtioBusState *mmio_virtio_bus = &mmio->bus;
+             BusState *mmio_bus = &mmio_virtio_bus->parent_obj;
+             if (!QTAILQ_EMPTY(&mmio_bus->children)) {
+                 gchar *mmio_cmdline = microvm_get_mmio_cmdline(mmio_bus->name);
+                 if (mmio_cmdline) {
+                     char *newcmd = g_strjoin(NULL, cmdline, mmio_cmdline, NULL);
+                     g_free(mmio_cmdline);
+                     g_free(cmdline);
+                     cmdline = newcmd;
+                 }
+             }
+         }
+     }
+     fw_cfg_modify_i32(x86ms->fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(cmdline) + 1);
+     fw_cfg_modify_string(x86ms->fw_cfg, FW_CFG_CMDLINE_DATA, cmdline);
+ }
+ static void microvm_machine_state_init(MachineState *machine)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(machine);
+     X86MachineState *x86ms = X86_MACHINE(machine);
+     Error *local_err = NULL;
+     microvm_memory_init(mms);
+     x86_cpus_init(x86ms, CPU_VERSION_LATEST);
+     if (local_err) {
+         error_report_err(local_err);
+         exit(1);
+     }
+     microvm_devices_init(mms);
+ }
+ static void microvm_machine_reset(MachineState *machine)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(machine);
+     CPUState *cs;
+     X86CPU *cpu;
+     if (machine->kernel_filename != NULL &&
+         mms->auto_kernel_cmdline && !mms->kernel_cmdline_fixed) {
+         microvm_fix_kernel_cmdline(machine);
+         mms->kernel_cmdline_fixed = true;
+     }
+     qemu_devices_reset();
+     CPU_FOREACH(cs) {
+         cpu = X86_CPU(cs);
+         if (cpu->apic_state) {
+             device_reset(cpu->apic_state);
+         }
+     }
+ }
+ static void microvm_machine_get_pic(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     OnOffAuto pic = mms->pic;
+     visit_type_OnOffAuto(v, name, &pic, errp);
+ }
+ static void microvm_machine_set_pic(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     visit_type_OnOffAuto(v, name, &mms->pic, errp);
+ }
+ static void microvm_machine_get_pit(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     OnOffAuto pit = mms->pit;
+     visit_type_OnOffAuto(v, name, &pit, errp);
+ }
+ static void microvm_machine_set_pit(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     visit_type_OnOffAuto(v, name, &mms->pit, errp);
+ }
+ static void microvm_machine_get_rtc(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     OnOffAuto rtc = mms->rtc;
+     visit_type_OnOffAuto(v, name, &rtc, errp);
+ }
+ static void microvm_machine_set_rtc(Object *obj, Visitor *v, const char *name,
+                                     void *opaque, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     visit_type_OnOffAuto(v, name, &mms->rtc, errp);
+ }
+ static bool microvm_machine_get_isa_serial(Object *obj, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     return mms->isa_serial;
+ }
+ static void microvm_machine_set_isa_serial(Object *obj, bool value,
+                                            Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     mms->isa_serial = value;
+ }
+ static bool microvm_machine_get_option_roms(Object *obj, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     return mms->option_roms;
+ }
+ static void microvm_machine_set_option_roms(Object *obj, bool value,
+                                             Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     mms->option_roms = value;
+ }
+ static bool microvm_machine_get_auto_kernel_cmdline(Object *obj, Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     return mms->auto_kernel_cmdline;
+ }
+ static void microvm_machine_set_auto_kernel_cmdline(Object *obj, bool value,
+                                                     Error **errp)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     mms->auto_kernel_cmdline = value;
+ }
+ static void microvm_machine_initfn(Object *obj)
+ {
+     MicrovmMachineState *mms = MICROVM_MACHINE(obj);
+     /* Configuration */
+     mms->pic = ON_OFF_AUTO_AUTO;
+     mms->pit = ON_OFF_AUTO_AUTO;
+     mms->rtc = ON_OFF_AUTO_AUTO;
+     mms->isa_serial = true;
+     mms->option_roms = true;
+     mms->auto_kernel_cmdline = true;
+     /* State */
+     mms->kernel_cmdline_fixed = false;
+ }
+ static void microvm_class_init(ObjectClass *oc, void *data)
+ {
+     MachineClass *mc = MACHINE_CLASS(oc);
+     mc->init = microvm_machine_state_init;
+     mc->family = "microvm_i386";
+     mc->desc = "microvm (i386)";
+     mc->units_per_default_bus = 1;
+     mc->no_floppy = 1;
+     mc->max_cpus = 288;
+     mc->has_hotpluggable_cpus = false;
+     mc->auto_enable_numa_with_memhp = false;
+     mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+     mc->nvdimm_supported = false;
+     /* Avoid relying too much on kernel components */
+     mc->default_kernel_irqchip_split = true;
+     /* Machine class handlers */
+     mc->reset = microvm_machine_reset;
+     object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto",
+                               microvm_machine_get_pic,
+                               microvm_machine_set_pic,
+                               NULL, NULL, &error_abort);
+     object_class_property_set_description(oc, MICROVM_MACHINE_PIC,
+         "Enable i8259 PIC", &error_abort);
+     object_class_property_add(oc, MICROVM_MACHINE_PIT, "OnOffAuto",
+                               microvm_machine_get_pit,
+                               microvm_machine_set_pit,
+                               NULL, NULL, &error_abort);
+     object_class_property_set_description(oc, MICROVM_MACHINE_PIT,
+         "Enable i8254 PIT", &error_abort);
+     object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto",
+                               microvm_machine_get_rtc,
+                               microvm_machine_set_rtc,
+                               NULL, NULL, &error_abort);
+     object_class_property_set_description(oc, MICROVM_MACHINE_RTC,
+         "Enable MC146818 RTC", &error_abort);
+     object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL,
+                                    microvm_machine_get_isa_serial,
+                                    microvm_machine_set_isa_serial,
+                                    &error_abort);
+     object_class_property_set_description(oc, MICROVM_MACHINE_ISA_SERIAL,
+         "Set off to disable the instantiation an ISA serial port",
+         &error_abort);
+     object_class_property_add_bool(oc, MICROVM_MACHINE_OPTION_ROMS,
+                                    microvm_machine_get_option_roms,
+                                    microvm_machine_set_option_roms,
+                                    &error_abort);
+     object_class_property_set_description(oc, MICROVM_MACHINE_OPTION_ROMS,
+         "Set off to disable loading option ROMs", &error_abort);
+     object_class_property_add_bool(oc, MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
+                                    microvm_machine_get_auto_kernel_cmdline,
+                                    microvm_machine_set_auto_kernel_cmdline,
+                                    &error_abort);
+     object_class_property_set_description(oc,
+         MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
+         "Set off to disable adding virtio-mmio devices to the kernel cmdline",
+         &error_abort);
+ }
+ static const TypeInfo microvm_machine_info = {
+     .name          = TYPE_MICROVM_MACHINE,
+     .parent        = TYPE_X86_MACHINE,
+     .instance_size = sizeof(MicrovmMachineState),
+     .instance_init = microvm_machine_initfn,
+     .class_size    = sizeof(MicrovmMachineClass),
+     .class_init    = microvm_class_init,
+     .interfaces = (InterfaceInfo[]) {
+          { }
+     },
+ };
+ static void microvm_machine_init(void)
+ {
+     type_register_static(&microvm_machine_info);
+ }
+ type_init(microvm_machine_init);
diff --cc hw/i386/pc.c
Simple merge
index 748fc2ee15bfa58df6c605c16f092c02552c0e5a,def3bc2d7bda77e4edffd7404ebc4e15df245a0a..d8b4c48021ba697b679f1785bf3fd9f13d612c2e
  #include "hw/loader.h"
  #include "sysemu/arch_init.h"
  #include "hw/i2c/smbus_eeprom.h"
 -#include "hw/timer/mc146818rtc.h"
 +#include "hw/rtc/mc146818rtc.h"
  #include "hw/xen/xen.h"
  #include "sysemu/kvm.h"
- #include "kvm_i386.h"
  #include "hw/kvm/clock.h"
  #include "hw/pci-host/q35.h"
  #include "hw/qdev-properties.h"
index 9d4ed54f65e215300ff3902e9a7cf5c9442bce12,0d7784b1041d9c0975a270286d867a1308ce9623..ee6bf82b400a3d9a9e252596c599c739a40ce7ce
  #include "sysemu/replay.h"
  #include "sysemu/reset.h"
  #include "sysemu/runstate.h"
 -#include "hw/timer/mc146818rtc.h"
 +#include "hw/rtc/mc146818rtc.h"
 +#include "hw/rtc/mc146818rtc_regs.h"
  #include "migration/vmstate.h"
  #include "qapi/error.h"
- #include "qapi/qapi-commands-misc-target.h"
  #include "qapi/qapi-events-misc-target.h"
  #include "qapi/visitor.h"
  #include "exec/address-spaces.h"
 -#include "hw/timer/mc146818rtc_regs.h"
++#include "hw/rtc/mc146818rtc_regs.h"
  
  #ifdef TARGET_I386
+ #include "qapi/qapi-commands-misc-target.h"
  #include "hw/i386/apic.h"
  #endif
  
index 7fa59d4279c5d35e94d08a534e38800e240eefed,a857dcdc69f9070ebc1808979e7fed3f909f6e30..10c93a096a1d495bbdf560744e285e53d076aed3
@@@ -1,14 -1,9 +1,17 @@@
 -#ifndef MC146818RTC_H
 -#define MC146818RTC_H
 +/*
 + * QEMU MC146818 RTC emulation
 + *
 + * Copyright (c) 2003-2004 Fabrice Bellard
 + *
 + * SPDX-License-Identifier: MIT
 + */
 +
 +#ifndef HW_RTC_MC146818RTC_H
 +#define HW_RTC_MC146818RTC_H
  
+ #include "qapi/qapi-types-misc.h"
+ #include "qemu/queue.h"
+ #include "qemu/timer.h"
  #include "hw/isa/isa.h"
  
  #define TYPE_MC146818_RTC "mc146818rtc"
index dd6c09e2fcf950d48073b8e5918c38e4e71e2ca4,631f71cfd917e3f68c4faaa1921576a52a325e9e..12197e05538bdcb01f3b596b6d633e22a6f863c8
   * THE SOFTWARE.
   */
  
 -#ifndef MC146818RTC_REGS_H
 -#define MC146818RTC_REGS_H
 +#ifndef HW_RTC_MC146818RTC_REGS_H
 +#define HW_RTC_MC146818RTC_REGS_H
  
  #include "qemu/timer.h"
 +#include "qemu/host-utils.h"
  
- #define RTC_ISA_IRQ 8
  #define RTC_SECONDS             0
  #define RTC_SECONDS_ALARM       1
  #define RTC_MINUTES             2
Simple merge
index 79a4ff1ed611635842c3704385176045f866f1e0,18f895690f595de9e6d0ee94103adfa4f65a08e7..c7af34f6b1b2c124925174e5a8e6a9244d98c139
@@@ -15,7 -15,8 +15,8 @@@
  
  #include "libqtest-single.h"
  #include "qemu/timer.h"
 -#include "hw/timer/mc146818rtc.h"
 -#include "hw/timer/mc146818rtc_regs.h"
++#include "hw/rtc/mc146818rtc.h"
 +#include "hw/rtc/mc146818rtc_regs.h"
  
  #define UIP_HOLD_LENGTH           (8 * NANOSECONDS_PER_SECOND / 32768)