Commit 377b155b authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* allow building QEMU without TCG or KVM support (Anthony)
* update AMD IOMMU copyright (David)
* compilation fixes for GCC and BSDs (Alexey, David, Paolo, Philippe)
* coalesced I/O bugfix (Jagannathan)
* Processor Tracing cpuid fix (Luwei)
* Kconfig fixes (Paolo, David)
* Cleanups (Paolo, Wei)
* PVH vs. multiboot fix (Stefano)
* LSI bugfixes (Sven)
* elf2dmp Coverity fix (Victor)
* scsi-disk fix (Zhengui)
* authorization support for chardev TLS (Daniel)

# gpg: Signature made Mon 11 Mar 2019 16:12:00 GMT
# 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: (31 commits)
  qemugdb: fix licensing
  chardev: add support for authorization for TLS clients
  qom: cpu: destroy work_mutex in cpu_common_finalize
  exec.c: refactor function flatview_add_to_dispatch()
  lsi: 810/895A are always little endian
  lsi: return dfifo value
  lsi: use SCSI phase names instead of numbers in trace
  lsi: use enum type for s->msg_action
  lsi: use enum type for s->waiting
  lsi: use ldn_le_p()/stn_le_p()
  scsi-disk: Fix crash if request is invaild or disk is no medium
  configure: Disable W^X on OpenBSD
  oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure
  accel: Allow to build QEMU without TCG or KVM support
  build: clean trace/generated-helpers.c
  build: remove unnecessary assignments from Makefile.target
  build: get rid of target-obj-y
  update copyright notice
  lsi: check if SIGP bit is already set in Wait reselect
  lsi: implement basic SBCL functionality
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c8761809 328eb60d

Makefile.objs

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ authz-obj-y = authz/ 
#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img



block-obj-y += nbd/

block-obj-y = nbd/

block-obj-y += block.o blockjob.o job.o

block-obj-y += block/ scsi/

block-obj-y += qemu-io-cmds.o
@@ -101,7 +101,6 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o 
######################################################################

# tracing

util-obj-y +=  trace/

target-obj-y += trace/



######################################################################

# guest agent

Makefile.target

+3 −8
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ all: $(PROGS) stap 
# Dummy command so that make thinks it has done something

	@true



obj-y += trace/



#########################################################

# cpu emulator library

obj-y += exec.o
@@ -173,13 +175,7 @@ endif # CONFIG_SOFTMMU 
dummy := $(call unnest-vars,,obj-y)

all-obj-y := $(obj-y)



target-obj-y :=

block-obj-y :=

common-obj-y :=

chardev-obj-y :=

include $(SRC_PATH)/Makefile.objs

dummy := $(call unnest-vars,,target-obj-y)

target-obj-y-save := $(target-obj-y)

dummy := $(call unnest-vars,.., \

               authz-obj-y \

               block-obj-y \
@@ -191,9 +187,7 @@ dummy := $(call unnest-vars,.., \ 
               io-obj-y \

               common-obj-y \

               common-obj-m)

target-obj-y := $(target-obj-y-save)

all-obj-y += $(common-obj-y)

all-obj-y += $(target-obj-y)

all-obj-y += $(qom-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)
@@ -228,6 +222,7 @@ clean: clean-target 
	rm -f *.a *~ $(PROGS)

	rm -f $(shell find . -name '*.[od]')

	rm -f hmp-commands.h gdbstub-xml.c

	rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp

ifdef CONFIG_TRACE_SYSTEMTAP

	rm -f *.stp

endif

accel/accel.c

+3 −1
Original line number Diff line number Diff line
@@ -91,7 +91,9 @@ void configure_accelerator(MachineState *ms, const char *progname) 
#elif defined(CONFIG_KVM)

            accel = "kvm";

#else

#error "No default accelerator available"

            error_report("No accelerator selected and"

                         " no default accelerator available");

            exit(1);

#endif

        }

    }

block/iscsi.c

+7 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048, 8192, 32768} 
 * unallocated. */

#define ISCSI_CHECKALLOC_THRES 64



#ifdef __linux__



static void

iscsi_bh_cb(void *p)

{
@@ -172,6 +174,8 @@ iscsi_schedule_bh(IscsiAIOCB *acb) 
    qemu_bh_schedule(acb->bh);

}



#endif



static void iscsi_co_generic_bh_cb(void *opaque)

{

    struct IscsiTask *iTask = opaque;
@@ -290,6 +294,8 @@ static void iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask) 
    };

}



#ifdef __linux__



/* Called (via iscsi_service) with QemuMutex held. */

static void

iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data,
@@ -338,6 +344,7 @@ static const AIOCBInfo iscsi_aiocb_info = { 
    .cancel_async       = iscsi_aio_cancel,

};



#endif



static void iscsi_process_read(void *arg);

static void iscsi_process_write(void *arg);

chardev/char-socket.c

+11 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ typedef struct { 
    QIONetListener *listener;

    GSource *hup_source;

    QCryptoTLSCreds *tls_creds;

    char *tls_authz;

    TCPChardevState state;

    int max_size;

    int do_telnetopt;
@@ -807,7 +808,7 @@ static void tcp_chr_tls_init(Chardev *chr) 
    if (s->is_listen) {

        tioc = qio_channel_tls_new_server(

            s->ioc, s->tls_creds,

            NULL, /* XXX Use an ACL */

            s->tls_authz,

            &err);

    } else {

        tioc = qio_channel_tls_new_client(
@@ -1055,6 +1056,7 @@ static void char_socket_finalize(Object *obj) 
    if (s->tls_creds) {

        object_unref(OBJECT(s->tls_creds));

    }

    g_free(s->tls_authz);



    qemu_chr_be_event(chr, CHR_EVENT_CLOSED);

}
@@ -1242,6 +1244,11 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, 
        break;

    }



    if (sock->has_tls_authz && !sock->has_tls_creds) {

        error_setg(errp, "'tls_authz' option requires 'tls_creds' option");

        return false;

    }



    /* Validate any options which have a dependancy on client vs server */

    if (!sock->has_server || sock->server) {

        if (sock->has_reconnect) {
@@ -1320,6 +1327,7 @@ static void qmp_chardev_open_socket(Chardev *chr, 
            }

        }

    }

    s->tls_authz = g_strdup(sock->tls_authz);



    s->addr = addr = socket_address_flatten(sock->addr);
@@ -1399,6 +1407,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
    sock->reconnect = qemu_opt_get_number(opts, "reconnect", 0);

    sock->has_tls_creds = qemu_opt_get(opts, "tls-creds");

    sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds"));

    sock->has_tls_authz = qemu_opt_get(opts, "tls-authz");

    sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz"));



    addr = g_new0(SocketAddressLegacy, 1);

    if (path) {