OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-arm queue: 

* arm/smmuv3: Fix broken VM state migration
  * armv7m_nvic: Fix broken VM state migration
  * hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
  * hw/arm/iotkit: Fix IRQ number for timer1
  * hw/misc/tz-mpc: Zero the LUT on initialization, not just reset
  * target/arm: Remove duplicate 'host' entry in '-cpu ?' output
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJbXx2hAAoJEDwlJe0UNgzeFbgP/1Rnv6TTrxsqdINCbVIZk95G
 uV7pI2zQ/G7mdRmwk26U52mkLEB4Jk9Noqx86OKXMU8jKqOw+hzcHukjtnGb2j2t
 OYhXC2vp/6TSZAX8q0XGSkoQAdTErA7rEeXYf36y/ifGZeZQJZAR1oVikl0JRGCe
 yvRUjt0cQ7CiJVbxUbXioxSV5HvKW2YYop/F4Lb3kYMtqcCbHzuRJHaKDGa3NGZR
 JKsUrmlG3gUYjFv3mqS6vdmjU2SAj+XtnROXwQ681XTKUdi6AwFzEtyICDHlf/Gi
 9lBKbuAbv31rCvuwqnOZoxrtAO6WJih77/2eFFEByVsdCLYiFCvOcABldRhQ+zav
 8tNavUkql8VESHaP1PpAoG6nSQrkzWSB0fy/Jjqh5RxVo2vnqdqten+wJeBqsc+1
 KaOnHkNLx4WfNZbh1397tAmfb6e4dnTKs4rgbGapUfKowkocGtRFg8Ep3g2YQQc0
 G1OfIuWEfO/IBlxRDPUotZEAcA11TXSsy5LEHSu2VZdCIYW13xxt7g19ENyNUIY4
 wesGTzBUkPudh5WJc15WSF8yF4mNhafalQ9msLAJz1B+NMV7GGfLX4MQM5ffq1UJ
 33x8PEsTE1decKBGwtHh+j8kgEe9FXo/X/LOcysvgeM7UBtGXQI2qTwDpXZXxfjd
 /ZydejQM01Rym5JKJxTv
 =QNZi
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180730' into staging

target-arm queue:
 * arm/smmuv3: Fix broken VM state migration
 * armv7m_nvic: Fix broken VM state migration
 * hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
 * hw/arm/iotkit: Fix IRQ number for timer1
 * hw/misc/tz-mpc: Zero the LUT on initialization, not just reset
 * target/arm: Remove duplicate 'host' entry in '-cpu ?' output

# gpg: Signature made Mon 30 Jul 2018 15:16:01 BST
# gpg:                using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20180730:
  target/arm: Remove duplicate 'host' entry in '-cpu ?' output
  hw/misc/tz-mpc: Zero the LUT on initialization, not just reset
  hw/arm/iotkit: Fix IRQ number for timer1
  armv7m_nvic: Fix m-security subsection name
  hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host()
  arm/smmuv3: Fix missing VMSD terminator

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-07-30 17:27:54 +01:00
parent 6d9dd5fb9d 0261fb805c
commit 7aefc14565
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/iotkit.c
View File

@ -382,7 +382,7 @@ static void iotkit_realize(DeviceState *dev, Error **errp)
return;
}
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,
qdev_get_gpio_in(DEVICE(&s->armv7m), 3));
qdev_get_gpio_in(DEVICE(&s->armv7m), 4));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err);
if (err) {

1
hw/arm/smmuv3.c
View File

@ -1414,6 +1414,7 @@ static const VMStateDescription vmstate_smmuv3_queue = {
VMSTATE_UINT32(prod, SMMUQueue),
VMSTATE_UINT32(cons, SMMUQueue),
VMSTATE_UINT8(log2size, SMMUQueue),
VMSTATE_END_OF_LIST(),
},
};

1
hw/arm/sysbus-fdt.c
View File

@ -107,6 +107,7 @@ static void copy_properties_from_host(HostProperty *props, int nb_props,
/* mandatory property not found: bail out */
exit(1);
}
err = NULL;
}
}
}

2
hw/intc/armv7m_nvic.c
View File

@ -2064,7 +2064,7 @@ static int nvic_security_post_load(void *opaque, int version_id)
}
static const VMStateDescription vmstate_nvic_security = {
.name = "nvic/m-security",
.name = "armv7m_nvic/m-security",
.version_id = 1,
.minimum_version_id = 1,
.needed = nvic_security_needed,

2
hw/misc/tz-mpc.c
View File

@ -547,7 +547,7 @@ static void tz_mpc_realize(DeviceState *dev, Error **errp)
address_space_init(&s->blocked_io_as, &s->blocked_io,
"tz-mpc-blocked-io");
s->blk_lut = g_new(uint32_t, s->blk_max);
s->blk_lut = g_new0(uint32_t, s->blk_max);
}
static int tz_mpc_post_load(void *opaque, int version_id)

6
target/arm/helper.c
View File

@ -5591,12 +5591,6 @@ void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf)
(*cpu_fprintf)(f, "Available CPUs:\n");
g_slist_foreach(list, arm_cpu_list_entry, &s);
g_slist_free(list);
#ifdef CONFIG_KVM
/* The 'host' CPU type is dynamically registered only if KVM is
* enabled, so we have to special-case it here:
*/
(*cpu_fprintf)(f, " host (only available in KVM mode)\n");
#endif
}
static void arm_cpu_add_definition(gpointer data, gpointer user_data)