From 1232ed1f27ab36c161f03ad4a9c3c14c80973f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 12 Oct 2019 08:54:24 +0200 Subject: [PATCH 1/7] MAINTAINERS: Add hw/sd/ssi-sd.c in the SD section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hw/sd/ssi-sd.c file is orphean, add it to the SD section. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20191012065426.10772-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 740401bcbb..388415bb59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1482,6 +1482,7 @@ S: Odd Fixes F: include/hw/sd/sd* F: hw/sd/core.c F: hw/sd/sd* +F: hw/sd/ssi-sd.c F: tests/sd* USB From f8b345e41414504a42a55472c899e389e7dc4e2f Mon Sep 17 00:00:00 2001 From: Yury Kotov Date: Tue, 19 Nov 2019 14:07:09 +0300 Subject: [PATCH 2/7] monitor: Remove unused define MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the definition of QMP_ACCEPT_UNKNOWNS as it is unused since refactoring 5c678ee8d940 Signed-off-by: Yury Kotov Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20191119110709.13827-1-yury-kotov@yandex-team.ru> Signed-off-by: Laurent Vivier --- monitor/misc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index 3baa15f3bf..6680734ea1 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -106,9 +106,6 @@ struct MonFdset { QLIST_ENTRY(MonFdset) next; }; -/* QMP checker flags */ -#define QMP_ACCEPT_UNKNOWNS 1 - /* Protects mon_fdsets */ static QemuMutex mon_fdsets_lock; static QLIST_HEAD(, MonFdset) mon_fdsets; From 369276ebf3cbba419653a19a01b790f3bcf3aea7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Nov 2019 14:38:45 +0100 Subject: [PATCH 3/7] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemu_strtoi64() assumes int64_t is long long. This is marked FIXME. Replace by a QEMU_BUILD_BUG_ON() to avoid surprises. Same for qemu_strtou64(). Fix a typo in qemu_strtoul()'s contract while there. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20191125133846.27790-2-armbru@redhat.com> [lv: removed trailing whitespace] Signed-off-by: Laurent Vivier --- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 2380165230..36ce712271 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -542,7 +542,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base, * Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, - * and INT_MIN on underflow. + * and INT64_MIN on underflow. */ int qemu_strtoi64(const char *nptr, const char **endptr, int base, int64_t *result) @@ -557,8 +557,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base, return -EINVAL; } + /* This assumes int64_t is long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(int64_t) != sizeof(long long)); errno = 0; - /* FIXME This assumes int64_t is long long */ *result = strtoll(nptr, &ep, base); return check_strtox_error(nptr, ep, endptr, errno); } @@ -581,8 +582,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base, return -EINVAL; } + /* This assumes uint64_t is unsigned long long TODO relax */ + QEMU_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(unsigned long long)); errno = 0; - /* FIXME This assumes uint64_t is unsigned long long */ *result = strtoull(nptr, &ep, base); /* Windows returns 1 for negative out-of-range values. */ if (errno == ERANGE) { From 877e2cfb4c7daa62db827dff802d8ae282caf2d7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Nov 2019 14:38:46 +0100 Subject: [PATCH 4/7] test-keyval: Tighten test of trailing crap after size test_keyval_visit_size() should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflows uint64_t. Replace by "sz1=0Z". Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20191125133846.27790-3-armbru@redhat.com> Signed-off-by: Laurent Vivier --- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-keyval.c b/tests/test-keyval.c index 09b0ae3c68..e331a84149 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -478,7 +478,7 @@ static void test_keyval_visit_size(void) visit_free(v); /* Trailing crap */ - qdict = keyval_parse("sz1=16E,sz2=16Gi", NULL, &error_abort); + qdict = keyval_parse("sz1=0Z,sz2=16Gi", NULL, &error_abort); v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); visit_start_struct(v, NULL, NULL, 0, &error_abort); From d494d79eabfdac06aea89bf8cc6897964bb2f8fe Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 30 Sep 2019 19:10:44 +0200 Subject: [PATCH 5/7] target/sparc: Remove old TODO file This file hasn't seen a real (non-trivial) update since 2008 anymore, so we can assume that it is pretty much out of date and nobody cares for it anymore. Let's simply remove it. Signed-off-by: Thomas Huth Reviewed-by: Artyom Tarasenko Message-Id: <20190930171044.25312-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- target/sparc/TODO | 88 ----------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 target/sparc/TODO diff --git a/target/sparc/TODO b/target/sparc/TODO deleted file mode 100644 index b8c727e858..0000000000 --- a/target/sparc/TODO +++ /dev/null @@ -1,88 +0,0 @@ -TODO-list: - -CPU common: -- Unimplemented features/bugs: - - Delay slot handling may fail sometimes (branch end of page, delay - slot next page) - - Atomical instructions - - CPU features should match real CPUs (also ASI selection) -- Optimizations/improvements: - - Condition code/branch handling like x86, also for FPU? - - Remove remaining explicit alignment checks - - Global register for regwptr, so that windowed registers can be - accessed directly - - Improve Sparc32plus addressing - - NPC/PC static optimisations (use JUMP_TB when possible)? (Is this - obsolete?) - - Synthetic instructions - - MMU model dependent on CPU model - - Select ASI helper at translation time (on V9 only if known) - - KQemu/KVM support for VM only - - Hardware breakpoint/watchpoint support - - Cache emulation mode - - Reverse-endian pages - - Faster FPU emulation - - Busy loop detection - -Sparc32 CPUs: -- Unimplemented features/bugs: - - Sun4/Sun4c MMUs - - Some V8 ASIs - -Sparc64 CPUs: -- Unimplemented features/bugs: - - Interrupt handling - - Secondary address space, other MMU functions - - Many V9/UA2005/UA2007 ASIs - - Rest of V9 instructions, missing VIS instructions - - IG/MG/AG vs. UA2007 globals - - Full hypervisor support - - SMP/CMT - - Sun4v CPUs - -Sun4: -- To be added - -Sun4c: -- A lot of unimplemented features -- Maybe split from Sun4m - -Sun4m: -- Unimplemented features/bugs: - - Hardware devices do not match real boards - - Floppy does not work - - CS4231: merge with cs4231a, add DMA - - Add cg6, bwtwo - - Arbitrary resolution support - - PCI for MicroSparc-IIe - - JavaStation machines - - SBus slot probing, FCode ROM support - - SMP probing support - - Interrupt routing does not match real HW - - SuSE 7.3 keyboard sometimes unresponsive - - Gentoo 2004.1 SMP does not work - - SS600MP ledma -> lebuffer - - Type 5 keyboard - - Less fixed hardware choices - - DBRI audio (Am7930) - - BPP parallel - - Diagnostic switch - - ESP PIO mode - -Sun4d: -- A lot of unimplemented features: - - SBI - - IO-unit -- Maybe split from Sun4m - -Sun4u: -- Unimplemented features/bugs: - - Interrupt controller - - PCI/IOMMU support (Simba, JIO, Tomatillo, Psycho, Schizo, Safari...) - - SMP - - Happy Meal Ethernet, flash, I2C, GPIO - - A lot of real machine types - -Sun4v: -- A lot of unimplemented features - - A lot of real machine types From 8937a39da22e5d5689c516a2d4ce4f2bb6a378fc Mon Sep 17 00:00:00 2001 From: Han Han Date: Thu, 5 Dec 2019 10:48:21 +0800 Subject: [PATCH 6/7] Revert "qemu-options.hx: Update for reboot-timeout parameter" This reverts commit bbd9e6985ff342cbe15b9cb7eb30e842796fbbe8. In 20a1922032 we allowed reboot-timeout=-1 again, so update the doc accordingly. Signed-off-by: Han Han Reviewed-by: Markus Armbruster Message-Id: <20191205024821.245435-1-hhan@redhat.com> Signed-off-by: Laurent Vivier --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index c63e794b64..6cbbefd081 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -327,8 +327,8 @@ format(true color). The resolution should be supported by the SVGA mode, so the recommended is 320x240, 640x480, 800x640. A timeout could be passed to bios, guest will pause for @var{rb_timeout} ms -when boot failed, then reboot. If @option{reboot-timeout} is not set, -guest will not reboot by default. Currently Seabios for X86 +when boot failed, then reboot. If @var{rb_timeout} is '-1', guest will not +reboot, qemu passes '-1' to bios by default. Currently Seabios for X86 system support it. Do strict boot via @option{strict=on} as far as firmware/BIOS From 80bc935eaaf93e5b9a4efe97abd7c51d645f2612 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 16 Dec 2019 14:29:41 +0100 Subject: [PATCH 7/7] qemu-doc: Remove the unused "Guest Agent" node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The node has been removed from the texi file some months ago, so we should remove it from the menu section, too. Fixes: 27a296fce982 ("qemu-ga: Convert invocation documentation to rST") Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20191216132941.25729-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- qemu-doc.texi | 1 - 1 file changed, 1 deletion(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index eea91a2d1e..39f950471f 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -38,7 +38,6 @@ * Introduction:: * QEMU PC System emulator:: * QEMU System emulator for non PC targets:: -* QEMU Guest Agent:: * QEMU User space emulator:: * System requirements:: * Security::