Commit 697f5924 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* VFIO bugfix for AMD SEV (Alex)
* Kconfig improvements (Julio, Philippe)
* MemoryRegion reference counting bugfix (King Wang)
* Build system cleanups (Marc-André, myself)
* rdmacm-mux off-by-one (Marc-André)
* ZBC passthrough fixes (Shinichiro, myself)
* WHPX build fix (Stefan)
* char-pty fix (Wei Yang)

# gpg: Signature made Tue 16 Jul 2019 08:31:27 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  vl: make sure char-pty message displayed by moving setbuf to the beginning
  create_config: remove $(CONFIG_SOFTMMU) hack
  Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs
  hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI
  hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI
  target/i386: sev: Do not unpin ram device memory region
  checkpatch: detect doubly-encoded UTF-8
  hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller
  util: merge main-loop.c and iohandler.c
  Fix broken build with WHPX enabled
  memory: unref the memory region in simplify flatview
  hw/i386: turn off vmport if CONFIG_VMPORT is disabled
  rdmacm-mux: fix strcpy string warning
  build-sys: remove slirp cflags from main-loop.o
  iscsi: base all handling of check condition on scsi_sense_to_errno
  iscsi: fix busy/timeout/task set full
  scsi: add guest-recoverable ZBC errors
  scsi: explicitly list guest-recoverable sense codes
  scsi-disk: pass sense correctly for guest-recoverable errors

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d7179eca 45d8bc3a

block/iscsi.c

+14 −15
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static inline unsigned exp_random(double mean) 


static int iscsi_translate_sense(struct scsi_sense *sense)

{

    return - scsi_sense_to_errno(sense->key,

    return scsi_sense_to_errno(sense->key,

                               (sense->ascq & 0xFF00) >> 8,

                               sense->ascq & 0xFF);

}
@@ -244,13 +244,6 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 


    if (status != SCSI_STATUS_GOOD) {

        if (iTask->retries++ < ISCSI_CMD_RETRIES) {

            if (status == SCSI_STATUS_CHECK_CONDITION

                && task->sense.key == SCSI_SENSE_UNIT_ATTENTION) {

                error_report("iSCSI CheckCondition: %s",

                             iscsi_get_error(iscsi));

                iTask->do_retry = 1;

                goto out;

            }

            if (status == SCSI_STATUS_BUSY ||

                status == SCSI_STATUS_TIMEOUT ||

                status == SCSI_STATUS_TASK_SET_FULL) {
@@ -272,14 +265,20 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 
                timer_mod(&iTask->retry_timer,

                          qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time);

                iTask->do_retry = 1;

                return;

            }

            }

        iTask->err_code = iscsi_translate_sense(&task->sense);

        } else if (status == SCSI_STATUS_CHECK_CONDITION) {

            int error = iscsi_translate_sense(&task->sense);

            if (error == EAGAIN) {

                error_report("iSCSI CheckCondition: %s",

                             iscsi_get_error(iscsi));

                iTask->do_retry = 1;

            } else {

                iTask->err_code = -error;

                iTask->err_str = g_strdup(iscsi_get_error(iscsi));

            }

        }

    }



out:

    if (iTask->co) {

        aio_bh_schedule_oneshot(iTask->iscsilun->aio_context,

                                 iscsi_co_generic_bh_cb, iTask);
@@ -974,7 +973,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, 
    if (status < 0) {

        error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",

                     iscsi_get_error(iscsi));

        acb->status = iscsi_translate_sense(&acb->task->sense);

        acb->status = -iscsi_translate_sense(&acb->task->sense);

    }



    acb->ioh->driver_status = 0;

configure

+1 −1
Original line number Diff line number Diff line
@@ -7159,7 +7159,7 @@ if test "$live_block_migration" = "yes" ; then 
fi



if test "$tpm" = "yes"; then

  echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak

  echo 'CONFIG_TPM=y' >> $config_host_mak

fi



echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak

contrib/rdmacm-mux/main.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void parse_args(int argc, char *argv[]) 


        case 's':

            /* This is temporary, final name will build below */

            strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX);

            strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX - 1);

            break;



        case 'p':

hw/Makefile.objs

+32 −29
Original line number Diff line number Diff line 
devices-dirs-y = core/

ifeq ($(CONFIG_SOFTMMU), y)

devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/

devices-dirs-$(CONFIG_SOFTMMU) += acpi/

devices-dirs-$(CONFIG_SOFTMMU) += adc/

devices-dirs-$(CONFIG_SOFTMMU) += audio/

devices-dirs-$(CONFIG_SOFTMMU) += block/

devices-dirs-$(CONFIG_SOFTMMU) += bt/

devices-dirs-$(CONFIG_SOFTMMU) += char/

devices-dirs-$(CONFIG_SOFTMMU) += cpu/

devices-dirs-$(CONFIG_SOFTMMU) += display/

devices-dirs-$(CONFIG_SOFTMMU) += dma/

devices-dirs-$(CONFIG_SOFTMMU) += gpio/

devices-dirs-y += acpi/

devices-dirs-y += adc/

devices-dirs-y += audio/

devices-dirs-y += block/

devices-dirs-y += bt/

devices-dirs-y += char/

devices-dirs-y += cpu/

devices-dirs-y += display/

devices-dirs-y += dma/

devices-dirs-y += gpio/

devices-dirs-$(CONFIG_HYPERV) += hyperv/

devices-dirs-$(CONFIG_I2C) += i2c/

devices-dirs-$(CONFIG_SOFTMMU) += ide/

devices-dirs-$(CONFIG_SOFTMMU) += input/

devices-dirs-$(CONFIG_SOFTMMU) += intc/

devices-dirs-y += ide/

devices-dirs-y += input/

devices-dirs-y += intc/

devices-dirs-$(CONFIG_IPACK) += ipack/

devices-dirs-$(CONFIG_IPMI) += ipmi/

devices-dirs-$(CONFIG_SOFTMMU) += isa/

devices-dirs-$(CONFIG_SOFTMMU) += misc/

devices-dirs-$(CONFIG_SOFTMMU) += net/

devices-dirs-$(CONFIG_SOFTMMU) += rdma/

devices-dirs-$(CONFIG_SOFTMMU) += nvram/

devices-dirs-$(CONFIG_SOFTMMU) += pci/

devices-dirs-y += isa/

devices-dirs-y += misc/

devices-dirs-y += net/

devices-dirs-y += rdma/

devices-dirs-y += nvram/

devices-dirs-y += pci/

devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/

devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/

devices-dirs-y += pcmcia/

devices-dirs-$(CONFIG_SCSI) += scsi/

devices-dirs-$(CONFIG_SOFTMMU) += sd/

devices-dirs-$(CONFIG_SOFTMMU) += ssi/

devices-dirs-$(CONFIG_SOFTMMU) += timer/

devices-dirs-y += sd/

devices-dirs-y += ssi/

devices-dirs-y += timer/

devices-dirs-$(CONFIG_TPM) += tpm/

devices-dirs-$(CONFIG_SOFTMMU) += usb/

devices-dirs-y += usb/

devices-dirs-$(CONFIG_VFIO) += vfio/

devices-dirs-$(CONFIG_SOFTMMU) += virtio/

devices-dirs-$(CONFIG_SOFTMMU) += watchdog/

devices-dirs-$(CONFIG_SOFTMMU) += xen/

devices-dirs-y += virtio/

devices-dirs-y += watchdog/

devices-dirs-y += xen/

devices-dirs-$(CONFIG_MEM_DEVICE) += mem/

devices-dirs-$(CONFIG_SOFTMMU) += smbios/

devices-dirs-y += semihosting/

devices-dirs-y += core/

devices-dirs-y += smbios/

endif



common-obj-y += $(devices-dirs-y)

obj-y += $(devices-dirs-y)

hw/i386/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ config PC_ACPI 
config I440FX

    bool

    imply E1000_PCI

    imply VMPORT

    select PC_PCI

    select PC_ACPI

    select ACPI_SMBUS
@@ -58,7 +59,6 @@ config I440FX 
    select IDE_PIIX

    select DIMM

    select SMBIOS

    select VMPORT

    select VMMOUSE

    select FW_CFG_DMA
@@ -77,6 +77,7 @@ config Q35 
    imply VTD

    imply AMD_IOMMU

    imply E1000E_PCI_EXPRESS

    imply VMPORT

    select PC_PCI

    select PC_ACPI

    select PCI_EXPRESS_Q35
@@ -84,7 +85,6 @@ config Q35 
    select AHCI_ICH9

    select DIMM

    select SMBIOS

    select VMPORT

    select VMMOUSE

    select FW_CFG_DMA