* [Qemu-devel] [PULL 0/2] Ide patches
@ 2017-10-31 23:02 John Snow
2017-10-31 23:02 ` [Qemu-devel] [PULL 1/2] hw/ide/ahci: Move allwinner code into a separate file John Snow
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: John Snow @ 2017-10-31 23:02 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
The following changes since commit 7fa00e204902cee0b33a0c60de87e87319d1809f:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171031' into staging (2017-10-31 14:28:25 +0000)
are available in the git repository at:
https://github.com/jnsnow/qemu.git tags/ide-pull-request
for you to fetch changes up to 96f43c2b0a663f4789b51ed97297163321e7ba5e:
ide: avoid referencing NULL dev in rotational rate setting (2017-10-31 18:00:03 -0400)
----------------------------------------------------------------
----------------------------------------------------------------
Daniel P. Berrange (1):
ide: avoid referencing NULL dev in rotational rate setting
Thomas Huth (1):
hw/ide/ahci: Move allwinner code into a separate file
hw/ide/Makefile.objs | 1 +
hw/ide/ahci-allwinner.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++
hw/ide/ahci.c | 95 ------------------------------------
hw/ide/core.c | 4 +-
4 files changed, 131 insertions(+), 96 deletions(-)
create mode 100644 hw/ide/ahci-allwinner.c
--
2.9.5
^ permalink raw reply [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 1/2] hw/ide/ahci: Move allwinner code into a separate file 2017-10-31 23:02 [Qemu-devel] [PULL 0/2] Ide patches John Snow @ 2017-10-31 23:02 ` John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 2/2] ide: avoid referencing NULL dev in rotational rate setting John Snow 2017-11-02 11:47 ` [Qemu-devel] [PULL 0/2] Ide patches Peter Maydell 2 siblings, 0 replies; 11+ messages in thread From: John Snow @ 2017-10-31 23:02 UTC (permalink / raw) To: qemu-devel; +Cc: peter.maydell, jsnow, Thomas Huth From: Thomas Huth <thuth@redhat.com> The allwinner code is only needed for the allwinner board (for which we also have a separate CONFIG_ALLWINNER_A10 config switch), so it does not make sense that we compile this for all the other boards that need AHCI, too. Let's move it to a separate file that is only compiled when CONFIG_ALLWINNER_A10 is set. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 1508784509-29377-1-git-send-email-thuth@redhat.com Signed-off-by: John Snow <jsnow@redhat.com> --- hw/ide/Makefile.objs | 1 + hw/ide/ahci-allwinner.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++ hw/ide/ahci.c | 95 ------------------------------------ 3 files changed, 128 insertions(+), 95 deletions(-) create mode 100644 hw/ide/ahci-allwinner.c diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index 729e9bd..f0edca3 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -10,3 +10,4 @@ common-obj-$(CONFIG_IDE_VIA) += via.o common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c new file mode 100644 index 0000000..c3f1604 --- /dev/null +++ b/hw/ide/ahci-allwinner.c @@ -0,0 +1,127 @@ +/* + * QEMU Allwinner AHCI Emulation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that 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 "hw/hw.h" +#include "qemu/error-report.h" +#include "sysemu/block-backend.h" +#include "sysemu/dma.h" +#include "hw/ide/internal.h" +#include "hw/ide/ahci_internal.h" + +#include "trace.h" + +#define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_BISTSR ((0xac - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_BISTDECR ((0xb0 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_DIAGNR0 ((0xb4 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_DIAGNR1 ((0xb8 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_OOBR ((0xbc - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_PHYCS0R ((0xc0 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_PHYCS1R ((0xc4 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_PHYCS2R ((0xc8 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_TIMER1MS ((0xe0 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_GPARAM1R ((0xe8 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_GPARAM2R ((0xec - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_PPARAMR ((0xf0 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_TESTR ((0xf4 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_VERSIONR ((0xf8 - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_IDR ((0xfc - ALLWINNER_AHCI_MMIO_OFF) / 4) +#define ALLWINNER_AHCI_RWCR ((0xfc - ALLWINNER_AHCI_MMIO_OFF) / 4) + +static uint64_t allwinner_ahci_mem_read(void *opaque, hwaddr addr, + unsigned size) +{ + AllwinnerAHCIState *a = opaque; + AHCIState *s = &(SYSBUS_AHCI(a)->ahci); + uint64_t val = a->regs[addr / 4]; + + switch (addr / 4) { + case ALLWINNER_AHCI_PHYCS0R: + val |= 0x2 << 28; + break; + case ALLWINNER_AHCI_PHYCS2R: + val &= ~(0x1 << 24); + break; + } + trace_allwinner_ahci_mem_read(s, a, addr, val, size); + return val; +} + +static void allwinner_ahci_mem_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + AllwinnerAHCIState *a = opaque; + AHCIState *s = &(SYSBUS_AHCI(a)->ahci); + + trace_allwinner_ahci_mem_write(s, a, addr, val, size); + a->regs[addr / 4] = val; +} + +static const MemoryRegionOps allwinner_ahci_mem_ops = { + .read = allwinner_ahci_mem_read, + .write = allwinner_ahci_mem_write, + .valid.min_access_size = 4, + .valid.max_access_size = 4, + .endianness = DEVICE_LITTLE_ENDIAN, +}; + +static void allwinner_ahci_init(Object *obj) +{ + SysbusAHCIState *s = SYSBUS_AHCI(obj); + AllwinnerAHCIState *a = ALLWINNER_AHCI(obj); + + memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, a, + "allwinner-ahci", ALLWINNER_AHCI_MMIO_SIZE); + memory_region_add_subregion(&s->ahci.mem, ALLWINNER_AHCI_MMIO_OFF, + &a->mmio); +} + +static const VMStateDescription vmstate_allwinner_ahci = { + .name = "allwinner-ahci", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, AllwinnerAHCIState, + ALLWINNER_AHCI_MMIO_SIZE / 4), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_ahci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->vmsd = &vmstate_allwinner_ahci; +} + +static const TypeInfo allwinner_ahci_info = { + .name = TYPE_ALLWINNER_AHCI, + .parent = TYPE_SYSBUS_AHCI, + .instance_size = sizeof(AllwinnerAHCIState), + .instance_init = allwinner_ahci_init, + .class_init = allwinner_ahci_class_init, +}; + +static void sysbus_ahci_register_types(void) +{ + type_register_static(&allwinner_ahci_info); +} + +type_init(sysbus_ahci_register_types) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 32d1296..373311f 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1737,104 +1737,9 @@ static const TypeInfo sysbus_ahci_info = { .class_init = sysbus_ahci_class_init, }; -#define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_BISTSR ((0xac - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_BISTDECR ((0xb0 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_DIAGNR0 ((0xb4 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_DIAGNR1 ((0xb8 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_OOBR ((0xbc - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_PHYCS0R ((0xc0 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_PHYCS1R ((0xc4 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_PHYCS2R ((0xc8 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_TIMER1MS ((0xe0 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_GPARAM1R ((0xe8 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_GPARAM2R ((0xec - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_PPARAMR ((0xf0 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_TESTR ((0xf4 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_VERSIONR ((0xf8 - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_IDR ((0xfc - ALLWINNER_AHCI_MMIO_OFF) / 4) -#define ALLWINNER_AHCI_RWCR ((0xfc - ALLWINNER_AHCI_MMIO_OFF) / 4) - -static uint64_t allwinner_ahci_mem_read(void *opaque, hwaddr addr, - unsigned size) -{ - AllwinnerAHCIState *a = opaque; - AHCIState *s = &(SYSBUS_AHCI(a)->ahci); - uint64_t val = a->regs[addr/4]; - - switch (addr / 4) { - case ALLWINNER_AHCI_PHYCS0R: - val |= 0x2 << 28; - break; - case ALLWINNER_AHCI_PHYCS2R: - val &= ~(0x1 << 24); - break; - } - trace_allwinner_ahci_mem_read(s, a, addr, val, size); - return val; -} - -static void allwinner_ahci_mem_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - AllwinnerAHCIState *a = opaque; - AHCIState *s = &(SYSBUS_AHCI(a)->ahci); - - trace_allwinner_ahci_mem_write(s, a, addr, val, size); - a->regs[addr/4] = val; -} - -static const MemoryRegionOps allwinner_ahci_mem_ops = { - .read = allwinner_ahci_mem_read, - .write = allwinner_ahci_mem_write, - .valid.min_access_size = 4, - .valid.max_access_size = 4, - .endianness = DEVICE_LITTLE_ENDIAN, -}; - -static void allwinner_ahci_init(Object *obj) -{ - SysbusAHCIState *s = SYSBUS_AHCI(obj); - AllwinnerAHCIState *a = ALLWINNER_AHCI(obj); - - memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, a, - "allwinner-ahci", ALLWINNER_AHCI_MMIO_SIZE); - memory_region_add_subregion(&s->ahci.mem, ALLWINNER_AHCI_MMIO_OFF, - &a->mmio); -} - -static const VMStateDescription vmstate_allwinner_ahci = { - .name = "allwinner-ahci", - .version_id = 1, - .minimum_version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_UINT32_ARRAY(regs, AllwinnerAHCIState, - ALLWINNER_AHCI_MMIO_SIZE/4), - VMSTATE_END_OF_LIST() - } -}; - -static void allwinner_ahci_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - dc->vmsd = &vmstate_allwinner_ahci; -} - -static const TypeInfo allwinner_ahci_info = { - .name = TYPE_ALLWINNER_AHCI, - .parent = TYPE_SYSBUS_AHCI, - .instance_size = sizeof(AllwinnerAHCIState), - .instance_init = allwinner_ahci_init, - .class_init = allwinner_ahci_class_init, -}; - static void sysbus_ahci_register_types(void) { type_register_static(&sysbus_ahci_info); - type_register_static(&allwinner_ahci_info); } type_init(sysbus_ahci_register_types) -- 2.9.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Qemu-devel] [PULL 2/2] ide: avoid referencing NULL dev in rotational rate setting 2017-10-31 23:02 [Qemu-devel] [PULL 0/2] Ide patches John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 1/2] hw/ide/ahci: Move allwinner code into a separate file John Snow @ 2017-10-31 23:02 ` John Snow 2017-11-02 11:47 ` [Qemu-devel] [PULL 0/2] Ide patches Peter Maydell 2 siblings, 0 replies; 11+ messages in thread From: John Snow @ 2017-10-31 23:02 UTC (permalink / raw) To: qemu-devel; +Cc: peter.maydell, jsnow, Daniel P. Berrange From: "Daniel P. Berrange" <berrange@redhat.com> The 'dev' variable can be NULL when the guest OS calls identify on an IDE unit that does not have a drive attached to it. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20171020091403.1479-1-berrange@redhat.com Signed-off-by: John Snow <jsnow@redhat.com> --- hw/ide/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index a04766a..471d0c9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -208,7 +208,9 @@ static void ide_identify(IDEState *s) if (dev && dev->conf.discard_granularity) { put_le16(p + 169, 1); /* TRIM support */ } - put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */ + if (dev) { + put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */ + } ide_identify_size(s); s->identify_set = 1; -- 2.9.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2017-10-31 23:02 [Qemu-devel] [PULL 0/2] Ide patches John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 1/2] hw/ide/ahci: Move allwinner code into a separate file John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 2/2] ide: avoid referencing NULL dev in rotational rate setting John Snow @ 2017-11-02 11:47 ` Peter Maydell 2 siblings, 0 replies; 11+ messages in thread From: Peter Maydell @ 2017-11-02 11:47 UTC (permalink / raw) To: John Snow; +Cc: QEMU Developers On 31 October 2017 at 23:02, John Snow <jsnow@redhat.com> wrote: > The following changes since commit 7fa00e204902cee0b33a0c60de87e87319d1809f: > > Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171031' into staging (2017-10-31 14:28:25 +0000) > > are available in the git repository at: > > https://github.com/jnsnow/qemu.git tags/ide-pull-request > > for you to fetch changes up to 96f43c2b0a663f4789b51ed97297163321e7ba5e: > > ide: avoid referencing NULL dev in rotational rate setting (2017-10-31 18:00:03 -0400) > > ---------------------------------------------------------------- > > ---------------------------------------------------------------- > > Daniel P. Berrange (1): > ide: avoid referencing NULL dev in rotational rate setting > > Thomas Huth (1): > hw/ide/ahci: Move allwinner code into a separate file > > hw/ide/Makefile.objs | 1 + > hw/ide/ahci-allwinner.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++ > hw/ide/ahci.c | 95 ------------------------------------ > hw/ide/core.c | 4 +- > 4 files changed, 131 insertions(+), 96 deletions(-) > create mode 100644 hw/ide/ahci-allwinner.c > Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PULL 0/2] Ide patches @ 2018-03-27 4:56 John Snow 2018-03-27 16:11 ` Peter Maydell 2018-03-31 7:08 ` no-reply 0 siblings, 2 replies; 11+ messages in thread From: John Snow @ 2018-03-27 4:56 UTC (permalink / raw) To: qemu-devel; +Cc: peter.maydell, jsnow The following changes since commit 7b93d78a04aa242d377ae213b79db6c319c71847: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-03-26 15:17:25 +0100) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to eb69953ecb1cbe7b4c4093a97a4dab3daa315d4e: macio: fix NULL pointer dereference when issuing IDE trim (2018-03-27 00:38:00 -0400) ---------------------------------------------------------------- ---------------------------------------------------------------- Anton Nefedov (1): ide: fix invalid TRIM range abortion for macio Mark Cave-Ayland (1): macio: fix NULL pointer dereference when issuing IDE trim hw/ide/core.c | 17 +++++++++-------- hw/ide/macio.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) -- 2.14.3 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2018-03-27 4:56 John Snow @ 2018-03-27 16:11 ` Peter Maydell 2018-03-31 7:08 ` no-reply 1 sibling, 0 replies; 11+ messages in thread From: Peter Maydell @ 2018-03-27 16:11 UTC (permalink / raw) To: John Snow; +Cc: QEMU Developers On 27 March 2018 at 05:56, John Snow <jsnow@redhat.com> wrote: > The following changes since commit 7b93d78a04aa242d377ae213b79db6c319c71847: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-03-26 15:17:25 +0100) > > are available in the Git repository at: > > https://github.com/jnsnow/qemu.git tags/ide-pull-request > > for you to fetch changes up to eb69953ecb1cbe7b4c4093a97a4dab3daa315d4e: > > macio: fix NULL pointer dereference when issuing IDE trim (2018-03-27 00:38:00 -0400) > > ---------------------------------------------------------------- > > ---------------------------------------------------------------- > > Anton Nefedov (1): > ide: fix invalid TRIM range abortion for macio > > Mark Cave-Ayland (1): > macio: fix NULL pointer dereference when issuing IDE trim > > hw/ide/core.c | 17 +++++++++-------- > hw/ide/macio.c | 2 +- > 2 files changed, 10 insertions(+), 9 deletions(-) > Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2018-03-27 4:56 John Snow 2018-03-27 16:11 ` Peter Maydell @ 2018-03-31 7:08 ` no-reply 2018-04-02 16:34 ` John Snow 1 sibling, 1 reply; 11+ messages in thread From: no-reply @ 2018-03-31 7:08 UTC (permalink / raw) To: jsnow; +Cc: famz, qemu-devel, peter.maydell Hi, This series failed docker-build@min-glib build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. Type: series Message-id: 20180327045646.21112-1-jsnow@redhat.com Subject: [Qemu-devel] [PULL 0/2] Ide patches === TEST SCRIPT BEGIN === #!/bin/bash set -e git submodule update --init dtc # Let docker tests dump environment info export SHOW_ENV=1 export J=8 time make docker-test-build@min-glib === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 49a0f26939 Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180328' into staging a60769352d tcg: Mark muluh_i64 and mulsh_i64 as 64-bit ops === OUTPUT BEGIN === Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/dtc'... Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' BUILD min-glib make[1]: Entering directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' GEN /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot'... done. Your branch is up-to-date with 'origin/test'. Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/dtc'... Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb' Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/ui/keycodemapdb'... Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce' tar: /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar: Wrote only 2048 of 10240 bytes tar: Error is not recoverable: exiting now failed to create tar file COPY RUNNER RUN test-build in qemu:min-glib tar: Unexpected EOF in archive tar: Unexpected EOF in archive tar: Error is not recoverable: exiting now /var/tmp/qemu/run: line 32: prep_fail: command not found Environment variables: HOSTNAME=d3de5b81f6a8 MAKEFLAGS= -j8 J=8 CCACHE_DIR=/var/tmp/ccache EXTRA_CONFIGURE_OPTS= V= SHOW_ENV=1 PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PWD=/ TARGET_LIST= SHLVL=1 HOME=/root TEST_DIR=/tmp/qemu-test FEATURES= dtc DEBUG= _=/usr/bin/env Configure options: --enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install ERROR: DTC (libfdt) version >= 1.4.2 not present. Please install the DTC (libfdt) devel package Traceback (most recent call last): File "./tests/docker/docker.py", line 407, in <module> sys.exit(main()) File "./tests/docker/docker.py", line 404, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 261, in run return Docker().run(argv, args.keep, quiet=args.quiet) File "./tests/docker/docker.py", line 229, in run quiet=quiet) File "./tests/docker/docker.py", line 147, in _do_check return subprocess.check_call(self._command + cmd, **kwargs) File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=3f76e41234b211e8813a52540069c830', '-u', '0', '--security-opt', 'seccomp=unconfined', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023:/var/tmp/qemu:z,ro', 'qemu:min-glib', '/var/tmp/qemu/run', 'test-build']' returned non-zero exit status 1 make[1]: *** [tests/docker/Makefile.include:129: docker-run] Error 1 make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' make: *** [tests/docker/Makefile.include:163: docker-run-test-build@min-glib] Error 2 real 0m51.988s user 0m9.352s sys 0m6.949s === OUTPUT END === Test command exited with code: 2 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@redhat.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2018-03-31 7:08 ` no-reply @ 2018-04-02 16:34 ` John Snow 2018-04-03 2:18 ` Fam Zheng 0 siblings, 1 reply; 11+ messages in thread From: John Snow @ 2018-04-02 16:34 UTC (permalink / raw) To: qemu-devel; +Cc: famz, peter.maydell On 03/31/2018 03:08 AM, no-reply@patchew.org wrote: > Hi, > > This series failed docker-build@min-glib build test. Please find the testing commands and > their output below. If you have Docker installed, you can probably reproduce it > locally. > > Type: series > Message-id: 20180327045646.21112-1-jsnow@redhat.com > Subject: [Qemu-devel] [PULL 0/2] Ide patches > > === TEST SCRIPT BEGIN === > #!/bin/bash > set -e > git submodule update --init dtc > # Let docker tests dump environment info > export SHOW_ENV=1 > export J=8 > time make docker-test-build@min-glib > === TEST SCRIPT END === > > Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 > Switched to a new branch 'test' > 49a0f26939 Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180328' into staging > a60769352d tcg: Mark muluh_i64 and mulsh_i64 as 64-bit ops > > === OUTPUT BEGIN === > Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/dtc'... > Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' > BUILD min-glib > make[1]: Entering directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' > GEN /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot'... > done. > Your branch is up-to-date with 'origin/test'. > Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/dtc'... > Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' > Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb' > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/ui/keycodemapdb'... > Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce' > tar: /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar: Wrote only 2048 of 10240 bytes > tar: Error is not recoverable: exiting now > failed to create tar file > COPY RUNNER > RUN test-build in qemu:min-glib > tar: Unexpected EOF in archive > tar: Unexpected EOF in archive > tar: Error is not recoverable: exiting now > /var/tmp/qemu/run: line 32: prep_fail: command not found > Environment variables: > HOSTNAME=d3de5b81f6a8 > MAKEFLAGS= -j8 > J=8 > CCACHE_DIR=/var/tmp/ccache > EXTRA_CONFIGURE_OPTS= > V= > SHOW_ENV=1 > PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin > PWD=/ > TARGET_LIST= > SHLVL=1 > HOME=/root > TEST_DIR=/tmp/qemu-test > FEATURES= dtc > DEBUG= > _=/usr/bin/env > > Configure options: > --enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install > > ERROR: DTC (libfdt) version >= 1.4.2 not present. > Please install the DTC (libfdt) devel package > Environment problems? > Traceback (most recent call last): > File "./tests/docker/docker.py", line 407, in <module> > sys.exit(main()) > File "./tests/docker/docker.py", line 404, in main > return args.cmdobj.run(args, argv) > File "./tests/docker/docker.py", line 261, in run > return Docker().run(argv, args.keep, quiet=args.quiet) > File "./tests/docker/docker.py", line 229, in run > quiet=quiet) > File "./tests/docker/docker.py", line 147, in _do_check > return subprocess.check_call(self._command + cmd, **kwargs) > File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call > raise CalledProcessError(retcode, cmd) > subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=3f76e41234b211e8813a52540069c830', '-u', '0', '--security-opt', 'seccomp=unconfined', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023:/var/tmp/qemu:z,ro', 'qemu:min-glib', '/var/tmp/qemu/run', 'test-build']' returned non-zero exit status 1 > make[1]: *** [tests/docker/Makefile.include:129: docker-run] Error 1 > make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' > make: *** [tests/docker/Makefile.include:163: docker-run-test-build@min-glib] Error 2 > > real 0m51.988s > user 0m9.352s > sys 0m6.949s > === OUTPUT END === > > Test command exited with code: 2 > > > --- > Email generated automatically by Patchew [http://patchew.org/]. > Please send your feedback to patchew-devel@redhat.com > Unrelated to the patch as far as I can tell. --js ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2018-04-02 16:34 ` John Snow @ 2018-04-03 2:18 ` Fam Zheng 0 siblings, 0 replies; 11+ messages in thread From: Fam Zheng @ 2018-04-03 2:18 UTC (permalink / raw) To: John Snow; +Cc: qemu-devel, peter.maydell On Mon, 04/02 12:34, John Snow wrote: > > > On 03/31/2018 03:08 AM, no-reply@patchew.org wrote: > > Hi, > > > > This series failed docker-build@min-glib build test. Please find the testing commands and > > their output below. If you have Docker installed, you can probably reproduce it > > locally. > > > > Type: series > > Message-id: 20180327045646.21112-1-jsnow@redhat.com > > Subject: [Qemu-devel] [PULL 0/2] Ide patches > > > > === TEST SCRIPT BEGIN === > > #!/bin/bash > > set -e > > git submodule update --init dtc > > # Let docker tests dump environment info > > export SHOW_ENV=1 > > export J=8 > > time make docker-test-build@min-glib > > === TEST SCRIPT END === > > > > Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 > > Switched to a new branch 'test' > > 49a0f26939 Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180328' into staging > > a60769352d tcg: Mark muluh_i64 and mulsh_i64 as 64-bit ops > > > > === OUTPUT BEGIN === > > Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' > > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/dtc'... > > Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' > > BUILD min-glib > > make[1]: Entering directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' > > GEN /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar > > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot'... > > done. > > Your branch is up-to-date with 'origin/test'. > > Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' > > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/dtc'... > > Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' > > Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb' > > Cloning into '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar.vroot/ui/keycodemapdb'... > > Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce' > > tar: /var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023/qemu.tar: Wrote only 2048 of 10240 bytes > > tar: Error is not recoverable: exiting now > > failed to create tar file > > COPY RUNNER > > RUN test-build in qemu:min-glib > > tar: Unexpected EOF in archive > > tar: Unexpected EOF in archive > > tar: Error is not recoverable: exiting now > > /var/tmp/qemu/run: line 32: prep_fail: command not found > > Environment variables: > > HOSTNAME=d3de5b81f6a8 > > MAKEFLAGS= -j8 > > J=8 > > CCACHE_DIR=/var/tmp/ccache > > EXTRA_CONFIGURE_OPTS= > > V= > > SHOW_ENV=1 > > PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin > > PWD=/ > > TARGET_LIST= > > SHLVL=1 > > HOME=/root > > TEST_DIR=/tmp/qemu-test > > FEATURES= dtc > > DEBUG= > > _=/usr/bin/env > > > > Configure options: > > --enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install > > > > ERROR: DTC (libfdt) version >= 1.4.2 not present. > > Please install the DTC (libfdt) devel package > > > > Environment problems? > > > Traceback (most recent call last): > > File "./tests/docker/docker.py", line 407, in <module> > > sys.exit(main()) > > File "./tests/docker/docker.py", line 404, in main > > return args.cmdobj.run(args, argv) > > File "./tests/docker/docker.py", line 261, in run > > return Docker().run(argv, args.keep, quiet=args.quiet) > > File "./tests/docker/docker.py", line 229, in run > > quiet=quiet) > > File "./tests/docker/docker.py", line 147, in _do_check > > return subprocess.check_call(self._command + cmd, **kwargs) > > File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call > > raise CalledProcessError(retcode, cmd) > > subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=3f76e41234b211e8813a52540069c830', '-u', '0', '--security-opt', 'seccomp=unconfined', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-vi1_8690/src/docker-src.2018-03-31-03.07.40.30023:/var/tmp/qemu:z,ro', 'qemu:min-glib', '/var/tmp/qemu/run', 'test-build']' returned non-zero exit status 1 > > make[1]: *** [tests/docker/Makefile.include:129: docker-run] Error 1 > > make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-vi1_8690/src' > > make: *** [tests/docker/Makefile.include:163: docker-run-test-build@min-glib] Error 2 > > > > real 0m51.988s > > user 0m9.352s > > sys 0m6.949s > > === OUTPUT END === > > > > Test command exited with code: 2 > > > > > > --- > > Email generated automatically by Patchew [http://patchew.org/]. > > Please send your feedback to patchew-devel@redhat.com > > > > Unrelated to the patch as far as I can tell. Yes, -ENOSPC on the machine. The tester is having hard time cleaning up some hanging docker instances. I should resume working on the switching to VM based tests. Fam ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PULL 0/2] Ide patches @ 2015-07-08 18:09 John Snow 2015-07-08 19:45 ` Peter Maydell 0 siblings, 1 reply; 11+ messages in thread From: John Snow @ 2015-07-08 18:09 UTC (permalink / raw) To: qemu-devel; +Cc: peter.maydell, jsnow The following changes since commit c8232b39bb18a91cde39b8e0b60e731a4ce782b1: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-07-08 13:36:19 +0100) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to 702c8c8be2f3317c81fff83f82d8a5f1d50d41b8: ahci: Fix CD-ROM signature (2015-07-08 14:07:47 -0400) ---------------------------------------------------------------- ---------------------------------------------------------------- Hannes Reinecke (1): ahci: Fix CD-ROM signature John Snow (1): libqos/ahci: fix ahci_write_fis for ncq on ppc64 hw/ide/ahci.h | 2 +- tests/libqos/ahci.c | 20 +++++++++++--------- tests/libqos/ahci.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) -- 2.1.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ide patches 2015-07-08 18:09 John Snow @ 2015-07-08 19:45 ` Peter Maydell 0 siblings, 0 replies; 11+ messages in thread From: Peter Maydell @ 2015-07-08 19:45 UTC (permalink / raw) To: John Snow; +Cc: QEMU Developers On 8 July 2015 at 19:09, John Snow <jsnow@redhat.com> wrote: > The following changes since commit c8232b39bb18a91cde39b8e0b60e731a4ce782b1: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-07-08 13:36:19 +0100) > > are available in the git repository at: > > https://github.com/jnsnow/qemu.git tags/ide-pull-request > > for you to fetch changes up to 702c8c8be2f3317c81fff83f82d8a5f1d50d41b8: > > ahci: Fix CD-ROM signature (2015-07-08 14:07:47 -0400) > Applied, thanks. -- PMM ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-04-03 2:18 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-10-31 23:02 [Qemu-devel] [PULL 0/2] Ide patches John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 1/2] hw/ide/ahci: Move allwinner code into a separate file John Snow 2017-10-31 23:02 ` [Qemu-devel] [PULL 2/2] ide: avoid referencing NULL dev in rotational rate setting John Snow 2017-11-02 11:47 ` [Qemu-devel] [PULL 0/2] Ide patches Peter Maydell -- strict thread matches above, loose matches on Subject: below -- 2018-03-27 4:56 John Snow 2018-03-27 16:11 ` Peter Maydell 2018-03-31 7:08 ` no-reply 2018-04-02 16:34 ` John Snow 2018-04-03 2:18 ` Fam Zheng 2015-07-08 18:09 John Snow 2015-07-08 19:45 ` Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).